From ca44510f34375a5d3b4283ee6308d4e3780634a9 Mon Sep 17 00:00:00 2001 From: anna Date: Fri, 19 Oct 2012 15:49:59 +0200 Subject: [PATCH] nullable problems (IDEA-93275) --- .../codeInspection/nullable/NullableStuffInspection.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/java-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspection.java b/java/java-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspection.java index bfd78c78ca48..66444fe29e9e 100644 --- a/java/java-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspection.java @@ -357,7 +357,7 @@ public class NullableStuffInspection extends BaseLocalInspectionTool { for (int i = 0; i < psiParameters.length; i++) { if (parameterQuickFixSuggested[i]) continue; PsiParameter parameter = psiParameters[i]; - if (parameterAnnotated[i] && !nullableManager.isNotNull(parameter, false)) { + if (parameterAnnotated[i] && !nullableManager.isNotNull(parameter, false) && !nullableManager.isNullable(parameter, false)) { parameters[i].getNameIdentifier(); //be sure that corresponding tree element available PsiAnnotation annotation = AnnotationUtil.findAnnotation(parameters[i], nullableManager.getNotNulls()); holder.registerProblem(annotation,