EA-61050 - NPE: JavaSafeDeleteProcessor.findConflicts

This commit is contained in:
Anna Kozlova
2014-10-07 13:31:31 +02:00
parent 1cb7588757
commit 6456f0b335
@@ -223,7 +223,7 @@ public class JavaSafeDeleteProcessor extends SafeDeleteProcessorDelegateBase {
if (element instanceof PsiMethod) {
final PsiClass containingClass = ((PsiMethod)element).getContainingClass();
if (!containingClass.hasModifierProperty(PsiModifier.ABSTRACT)) {
if (containingClass != null && !containingClass.hasModifierProperty(PsiModifier.ABSTRACT)) {
final PsiMethod[] superMethods = ((PsiMethod) element).findSuperMethods();
for (PsiMethod superMethod : superMethods) {
if (isInside(superMethod, allElementsToDelete)) continue;