EA-27366 - NPE: ExtractMethodProcessor.processMatch

(cherry picked from commit e1c2bbc461d68db1bd2986946449fa7875c725a8)

java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java

@@ -877,8 +877,10 @@ public class ExtractMethodProcessor implements MatchProvider {
     }
     for (ParameterTablePanel.VariableData data : datas) {
       final List<PsiElement> parameterValue = match.getParameterValues(data.variable);
-      for (PsiElement val : parameterValue) {
-        methodCallExpression.getArgumentList().add(val);
+      if (parameterValue != null) {
+        for (PsiElement val : parameterValue) {
+          methodCallExpression.getArgumentList().add(val);
+        }
       }
     }
     return match.replace(myExtractedMethod, methodCallExpression, myOutputVariable);

java/java-impl/src/com/intellij/refactoring/util/duplicates/Match.java

@@ -71,6 +71,7 @@ public final class Match {
     return myMatchEnd;
   }
 
+  @Nullable
   public List<PsiElement> getParameterValues(PsiVariable parameter) {
     return myParameterValues.get(parameter);
   }