From 4ceba03ed62e5c3f6bbec99197ab4574c157c0d0 Mon Sep 17 00:00:00 2001
From: "Maxim.Mossienko" <Maxim.Mossienko@jetbrains.com>
Date: Mon, 17 Aug 2015 13:10:39 +0200
Subject: [PATCH] fix possible NPE if we remove test trace

---
 .../execution/testDiscovery/TestDiscoveryIndex.java    | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/java/execution/impl/src/com/intellij/execution/testDiscovery/TestDiscoveryIndex.java b/java/execution/impl/src/com/intellij/execution/testDiscovery/TestDiscoveryIndex.java
index b78ba17aa5f5..416006f1c712 100644
--- a/java/execution/impl/src/com/intellij/execution/testDiscovery/TestDiscoveryIndex.java
+++ b/java/execution/impl/src/com/intellij/execution/testDiscovery/TestDiscoveryIndex.java
@@ -552,11 +552,13 @@ public class TestDiscoveryIndex implements ProjectComponent {
             }
           }
         }
-        for (int classQName : previousClassData.keys()) {
-          if (classData.containsKey(classQName)) continue;
+        if (classData != null) {
+          for (int classQName : previousClassData.keys()) {
+            if (classData.containsKey(classQName)) continue;
 
-          TIntArrayList previousMethods = previousClassData.get(classQName);
-          removedClassData.put(classQName, previousMethods);
+            TIntArrayList previousMethods = previousClassData.get(classQName);
+            removedClassData.put(classQName, previousMethods);
+          }
         }
       }