diff --git a/java/java-impl/src/com/intellij/codeInspection/ex/EntryPointsManagerImpl.java b/java/java-impl/src/com/intellij/codeInspection/ex/EntryPointsManagerImpl.java index c1d316ff0914..0b0c60e7395d 100644 --- a/java/java-impl/src/com/intellij/codeInspection/ex/EntryPointsManagerImpl.java +++ b/java/java-impl/src/com/intellij/codeInspection/ex/EntryPointsManagerImpl.java @@ -432,7 +432,7 @@ public class EntryPointsManagerImpl implements PersistentStateComponent myAddNonJavaEntries = addNonJavaEntries; } - public boolean isEntryPoint(PsiModifierListOwner element) { + public boolean isEntryPoint(@NotNull PsiModifierListOwner element) { return AnnotationUtil.isAnnotated(element, ADDITIONAL_ANNOTATIONS) || AnnotationUtil.isAnnotated(element, getAdditionalAnnotations()); } diff --git a/java/java-impl/src/com/intellij/codeInspection/unusedParameters/UnusedParametersInspection.java b/java/java-impl/src/com/intellij/codeInspection/unusedParameters/UnusedParametersInspection.java index aed39b1e7802..2e32ea1a744d 100644 --- a/java/java-impl/src/com/intellij/codeInspection/unusedParameters/UnusedParametersInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/unusedParameters/UnusedParametersInspection.java @@ -74,7 +74,9 @@ public class UnusedParametersInspection extends GlobalJavaInspectionTool { if ((refMethod.isAbstract() || refMethod.getOwnerClass().isInterface()) && refMethod.getDerivedMethods().isEmpty()) return null; if (RefUtil.isEntryPoint(refMethod)) return null; - if (EntryPointsManagerImpl.getInstance(manager.getProject()).isEntryPoint(refMethod.getElement())) return null; + + final PsiModifierListOwner element = refMethod.getElement(); + if (element != null && EntryPointsManagerImpl.getInstance(manager.getProject()).isEntryPoint(element)) return null; if (refMethod.isAppMain()) return null;