From 49ccfe88a685dde6622bb05c7b5a0fff58b41cbb Mon Sep 17 00:00:00 2001
From: anna <anna.kozlova@jetbrains.com>
Date: Wed, 8 Jun 2011 22:55:25 +0400
Subject: [PATCH] EA-28152 - NPE:
 RenameJavaMemberProcessor.findMemberHidesOuterMemberCollisions

---
 .../intellij/refactoring/rename/RenameJavaMemberProcessor.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaMemberProcessor.java b/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaMemberProcessor.java
index 46e22d6b03bb..0a4cd3cad086 100644
--- a/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaMemberProcessor.java
+++ b/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaMemberProcessor.java
@@ -114,7 +114,7 @@ public abstract class RenameJavaMemberProcessor extends RenamePsiElementProcesso
     }
 
     final PsiClass fieldClass = member.getContainingClass();
-    for (PsiClass aClass = fieldClass.getContainingClass(); aClass != null; aClass = aClass.getContainingClass()) {
+    for (PsiClass aClass = fieldClass != null ? fieldClass.getContainingClass() : null; aClass != null; aClass = aClass.getContainingClass()) {
       final PsiMember conflict;
       if (member instanceof PsiMethod) {
         conflict = aClass.findMethodBySignature((PsiMethod)patternMember, true);