Snapshot aea001abfc1b38fec3a821bcd5174cc77dc75787 from master branch of git://git.jetbrains.org/idea/community.git

Change-Id: Icdea2a2bd7ad43b4d05967b1f0479db3bda1c93c

1 files changed, 3 insertions, 3 deletions

diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/JavaPsiFacadeImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/JavaPsiFacadeImpl.java
index f80a0998b980..2bde13a67ae5 100644
--- a/java/java-psi-impl/src/com/intellij/psi/impl/JavaPsiFacadeImpl.java
+++ b/java/java-psi-impl/src/com/intellij/psi/impl/JavaPsiFacadeImpl.java
@@ -182,7 +182,7 @@ public class JavaPsiFacadeImpl extends JavaPsiFacadeEx {
     if (cache == null) {
       myPackageCache = new SoftReference<ConcurrentMap<String, PsiPackage>>(cache = new ConcurrentHashMap<String, PsiPackage>());
     }
-    
+
     PsiPackage aPackage = cache.get(qualifiedName);
     if (aPackage != null) {
       return aPackage;
@@ -352,9 +352,9 @@ public class JavaPsiFacadeImpl extends JavaPsiFacadeEx {
         ContainerUtil.quickSort(list, new Comparator<PsiClass>() {
           @Override
           public int compare(PsiClass o1, PsiClass o2) {
-            VirtualFile file2 = PsiUtilCore.getVirtualFile(o2);
             VirtualFile file1 = PsiUtilCore.getVirtualFile(o1);
-            return scope.compare(file2, file1);
+            VirtualFile file2 = PsiUtilCore.getVirtualFile(o2);
+            return file1 == null ? file2 == null ? 0 : -1 : file2 == null ? 1 : scope.compare(file2, file1);
           }
         });
       }