From f35fcd113e2eb75d1effa18d88f2fc02919de64b Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Fri, 6 Feb 2015 12:05:10 +0100
Subject: [PATCH] EA-64555 - NPE: ExtractMethodSignatureSuggester.<init>

---
 .../extractMethod/ExtractMethodProcessor.java | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java b/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java
index 15ff329d955c..daa1950d94d2 100644
--- a/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java
@@ -1713,14 +1713,17 @@ public class ExtractMethodProcessor implements MatchProvider {
     if (duplicates != null && !duplicates.isEmpty()) {
       return true;
     }
-    final ExtractMethodSignatureSuggester suggester = new ExtractMethodSignatureSuggester(myProject, myExtractedMethod, myMethodCall, myVariableDatum);
-    duplicates = suggester.getDuplicates(myExtractedMethod, myMethodCall);
-    if (duplicates != null && !duplicates.isEmpty()) {
-      myDuplicates      = duplicates;
-      myExtractedMethod = suggester.getExtractedMethod();
-      myMethodCall      = suggester.getMethodCall();
-      myVariableDatum   = suggester.getVariableData();
-      return null;
+
+    if (myExtractedMethod != null) {
+      final ExtractMethodSignatureSuggester suggester = new ExtractMethodSignatureSuggester(myProject, myExtractedMethod, myMethodCall, myVariableDatum);
+      duplicates = suggester.getDuplicates(myExtractedMethod, myMethodCall);
+      if (duplicates != null && !duplicates.isEmpty()) {
+        myDuplicates      = duplicates;
+        myExtractedMethod = suggester.getExtractedMethod();
+        myMethodCall      = suggester.getMethodCall();
+        myVariableDatum   = suggester.getVariableData();
+        return null;
+      }
     }
     return false;
   }