From 8db3d24782a717749bce1456fb19bb28d57abc49 Mon Sep 17 00:00:00 2001
From: Dmitry Boulytchev <dboulytchev@gmail.com>
Date: Thu, 5 Apr 2012 17:20:10 +0400
Subject: [PATCH] Better storage clean-up on class removal yet again
 (compile-server).

---
 .../org/jetbrains/ether/dependencyView/Mappings.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java b/jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java
index f79b0a38d312..c976b3631cd7 100644
--- a/jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java
+++ b/jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java
@@ -1675,9 +1675,9 @@ public class Mappings {
     }
   }
 
-  private void cleanupRemovedClass(final int className, ClassRepr cr) {
+  private void cleanupRemovedClass(final int className, ClassRepr cr, Collection<UsageRepr.Cluster> clusters) {
     if (cr == null) {
-    cr = new Util().reprByName(className);
+      cr = new Util().reprByName(className);
     }
 
     if (cr != null) {
@@ -1688,7 +1688,9 @@ public class Mappings {
       final int sourceFile = myClassToSourceFile.get(className);
 
       if (sourceFile > 0) {
-        final Collection<UsageRepr.Cluster> clusters = mySourceFileToUsages.get(sourceFile);
+        if (clusters == null) {
+          clusters = mySourceFileToUsages.get(sourceFile);
+        }
 
         if (clusters != null) {
           for (final UsageRepr.Cluster cluster : clusters) {
@@ -1727,7 +1729,7 @@ public class Mappings {
 
             if (classes != null) {
               for (final ClassRepr cr : classes) {
-                cleanupRemovedClass(cr.name, cr);
+                cleanupRemovedClass(cr.name, cr, clusters);
               }
             }
 
@@ -1741,7 +1743,7 @@ public class Mappings {
           delta.getDeletedClasses().forEach(new TIntProcedure() {
             @Override
             public boolean execute(int value) {
-              cleanupRemovedClass(value, null);
+              cleanupRemovedClass(value, null, null);
               return true;
             }
           });