From 9f75fc32feb04f10eb058281f097079fb69519bb Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 24 Mar 2011 18:08:37 +0100 Subject: [PATCH] fix @NotNull assertion in tests --- .../com/intellij/psi/impl/source/resolve/JavaResolveUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/JavaResolveUtil.java b/java/java-impl/src/com/intellij/psi/impl/source/resolve/JavaResolveUtil.java index b3860c3df88d..9e0948a847ef 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/JavaResolveUtil.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/resolve/JavaResolveUtil.java @@ -83,7 +83,7 @@ public class JavaResolveUtil { } int effectiveAccessLevel = PsiUtil.getAccessLevel(modifierList); - PsiFile file = FileContextUtil.getContextFile(placeFile); //TODO: implementation method!!!! + PsiFile file = placeFile == null ? null : FileContextUtil.getContextFile(placeFile); //TODO: implementation method!!!! if (JspPsiUtil.isInJspFile(file) && JspPsiUtil.isInJspFile(member.getContainingFile())) return true; if (file instanceof XmlFile && !JspPsiUtil.isInJspFile(file)) return true; if (effectiveAccessLevel == PsiUtil.ACCESS_LEVEL_PUBLIC) {