From b32ebc4f36748f2041497cd4c499a1a386ba2e64 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Mon, 6 Jun 2016 15:31:51 +0300
Subject: [PATCH] EA-83586 - NPE: JavaSafeDeleteProcessor.findConflicts

---
 .../refactoring/safeDelete/JavaSafeDeleteProcessor.java      | 5 ++++-
 .../safeDelete/SafeDeleteProcessorDelegateBase.java          | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/java/java-impl/src/com/intellij/refactoring/safeDelete/JavaSafeDeleteProcessor.java b/java/java-impl/src/com/intellij/refactoring/safeDelete/JavaSafeDeleteProcessor.java
index c7ad5eb99c01..650c7f321e09 100644
--- a/java/java-impl/src/com/intellij/refactoring/safeDelete/JavaSafeDeleteProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/safeDelete/JavaSafeDeleteProcessor.java
@@ -267,7 +267,10 @@ public class JavaSafeDeleteProcessor extends SafeDeleteProcessorDelegateBase {
     if (methodRefFound != null) {
       Collection<String> result = new ArrayList<>();
       result.add(methodRefFound);
-      result.addAll(super.findConflicts(element, elements, usages));
+      final Collection<String> conflicts = super.findConflicts(element, elements, usages);
+      if (conflicts != null) {
+        result.addAll(conflicts);
+      }
       return result;
     }
     return super.findConflicts(element, elements, usages);
diff --git a/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteProcessorDelegateBase.java b/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteProcessorDelegateBase.java
index d67692b2f10a..40e88b77bea0 100644
--- a/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteProcessorDelegateBase.java
+++ b/platform/lang-impl/src/com/intellij/refactoring/safeDelete/SafeDeleteProcessorDelegateBase.java
@@ -43,6 +43,7 @@ public abstract class SafeDeleteProcessorDelegateBase implements SafeDeleteProce
     return null;
   }
 
+  @Nullable
   public Collection<String> findConflicts(PsiElement element, PsiElement[] elements, UsageInfo[] usages) {
     return findConflicts(element, elements);
   }