From 5c334b7753ea4a2dadb7eaca1986e050df2d4011 Mon Sep 17 00:00:00 2001
From: Dmitry Boulytchev <db@mobilis.(none)>
Date: Sun, 23 Oct 2011 14:34:26 +0400
Subject: [PATCH] Fixed NPE in Mappings.integrate.

---
 .../jetbrains/ether/dependencyView/Mappings.java   | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java b/jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java
index 1b643f993b4b..dfbc41839be4 100644
--- a/jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java
+++ b/jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java
@@ -925,7 +925,7 @@ public class Mappings implements RW.Writable {
       for (StringCache.S file : removed) {
         final Set<ClassRepr> classes = (Set<ClassRepr>)sourceFileToClasses.foxyGet(file);
         final UsageRepr.Cluster cluster = sourceFileToUsages.get(file);
-        final Set<UsageRepr.Usage> usages = cluster.getUsages();
+        final Set<UsageRepr.Usage> usages = cluster == null ? null : cluster.getUsages();
 
         if (classes != null) {
           for (ClassRepr cr : classes) {
@@ -937,12 +937,14 @@ public class Mappings implements RW.Writable {
               classToSubclasses.removeFrom(superSomething, cr.name);
             }
 
-            for (UsageRepr.Usage u : usages) {
-              if (u instanceof UsageRepr.ClassUsage) {
-                final Set<StringCache.S> residents = cluster.getResidence(u);
+            if (usages != null) {
+              for (UsageRepr.Usage u : usages) {
+                if (u instanceof UsageRepr.ClassUsage) {
+                  final Set<StringCache.S> residents = cluster.getResidence(u);
 
-                if (residents != null && residents.contains(cr.name)) {
-                  classToClassDependency.removeFrom (((UsageRepr.ClassUsage)u).className, cr.name);
+                  if (residents != null && residents.contains(cr.name)) {
+                    classToClassDependency.removeFrom(((UsageRepr.ClassUsage)u).className, cr.name);
+                  }
                 }
               }
             }