From fc18fca21d76c3bf08f19e62136b4ae21d2d0298 Mon Sep 17 00:00:00 2001 From: Evgeny Gerashchenko Date: Wed, 12 Sep 2012 18:48:43 +0400 Subject: [PATCH] EA-39147 - NPE: BaseExternalAnnotationsManager.compare --- .../com/intellij/codeInsight/BaseExternalAnnotationsManager.java | 1 + 1 file changed, 1 insertion(+) diff --git a/java/java-psi-api/src/com/intellij/codeInsight/BaseExternalAnnotationsManager.java b/java/java-psi-api/src/com/intellij/codeInsight/BaseExternalAnnotationsManager.java index 91962423d476..89b476970f20 100644 --- a/java/java-psi-api/src/com/intellij/codeInsight/BaseExternalAnnotationsManager.java +++ b/java/java-psi-api/src/com/intellij/codeInsight/BaseExternalAnnotationsManager.java @@ -258,6 +258,7 @@ public abstract class BaseExternalAnnotationsManager extends ExternalAnnotations final VirtualFile ext = root.findFileByRelativePath(packageName.replace(".", "/") + "/" + ANNOTATIONS_XML); if (ext == null) continue; final PsiFile psiFile = myPsiManager.findFile(ext); + if (psiFile == null) continue; possibleAnnotationsXmls.add(psiFile); } if (!possibleAnnotationsXmls.isEmpty()) {