EA-25304 - NPE: PropertyUtil.filterMethods

This commit is contained in:
Dmitry Avdeev
2011-03-11 13:31:10 +03:00
parent dc3544252b
commit 0b034bdf7b
@@ -15,7 +15,6 @@
*/
package com.intellij.psi.util;
import com.intellij.codeInsight.AnnotationUtil;
import com.intellij.codeInsight.NullableNotNullManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
@@ -152,7 +151,9 @@ public class PropertyUtil {
private static boolean filterMethods(final PsiMethod method) {
if(method.hasModifierProperty(PsiModifier.STATIC) || !method.hasModifierProperty(PsiModifier.PUBLIC)) return true;
final String className = method.getContainingClass().getQualifiedName();
PsiClass psiClass = method.getContainingClass();
if (psiClass == null) return false;
final String className = psiClass.getQualifiedName();
return className != null && className.equals(CommonClassNames.JAVA_LANG_OBJECT);
}