From d7e03e41985dfc6cffe225a18403374f9a4e859c Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Thu, 10 Nov 2011 15:43:00 +0100
Subject: [PATCH] EA-31349 - NPE:
 ChangeMethodSignatureFromUsageFix.isMethodSignatureExists

---
 .../impl/quickfix/ChangeMethodSignatureFromUsageFix.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeMethodSignatureFromUsageFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeMethodSignatureFromUsageFix.java
index 8d30aa554027..43b9c945ea18 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeMethodSignatureFromUsageFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeMethodSignatureFromUsageFix.java
@@ -151,7 +151,7 @@ public class ChangeMethodSignatureFromUsageFix implements IntentionAction, HighP
 
   @Override
   public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) {
-    if (!myTargetMethod.isValid()) return false;
+    if (!myTargetMethod.isValid() || myTargetMethod.getContainingClass() == null) return false;
     for (PsiExpression expression : myExpressions) {
       if (!expression.isValid()) return false;
     }
@@ -163,6 +163,7 @@ public class ChangeMethodSignatureFromUsageFix implements IntentionAction, HighP
 
   public boolean isMethodSignatureExists() {
     PsiClass target = myTargetMethod.getContainingClass();
+    LOG.assertTrue(target != null);
     PsiMethod[] methods = target.findMethodsByName(myTargetMethod.getName(), false);
     for (PsiMethod method : methods) {
       if (PsiUtil.isApplicable(method, PsiSubstitutor.EMPTY, myExpressions)) return true;