From 87be7fc36b14596cbf0a60c3484805a99f58eab2 Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Wed, 23 Oct 2013 13:22:47 +0200
Subject: [PATCH] NPE

---
 .../codeInsight/completion/scope/JavaCompletionProcessor.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/scope/JavaCompletionProcessor.java b/java/java-impl/src/com/intellij/codeInsight/completion/scope/JavaCompletionProcessor.java
index 87cea9397b93..0344cfd602fb 100644
--- a/java/java-impl/src/com/intellij/codeInsight/completion/scope/JavaCompletionProcessor.java
+++ b/java/java-impl/src/com/intellij/codeInsight/completion/scope/JavaCompletionProcessor.java
@@ -55,7 +55,7 @@ public class JavaCompletionProcessor extends BaseScopeProcessor implements Eleme
       if (object instanceof MethodSignature) {
         return MethodSignatureUtil.METHOD_PARAMETERS_ERASURE_EQUALITY.computeHashCode((MethodSignature)object);
       }
-      return object.hashCode();
+      return object != null ? object.hashCode() : 0;
     }
 
     @Override
@@ -63,7 +63,7 @@ public class JavaCompletionProcessor extends BaseScopeProcessor implements Eleme
       if (o1 instanceof MethodSignature && o2 instanceof MethodSignature) {
         return MethodSignatureUtil.METHOD_PARAMETERS_ERASURE_EQUALITY.equals((MethodSignature)o1, (MethodSignature)o2);
       }
-      return o1.equals(o2);
+      return o1 != null ? o1.equals(o2) : o2 == null;
     }
   });
   private final List<CompletionElement> myResults = new ArrayList<CompletionElement>();