From 78288819882b04a71dedd2dd18ed7208d2a92893 Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Thu, 12 Jul 2012 15:21:04 +0200
Subject: [PATCH] allow to override wrong annotation

---
 .../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 39b807db5bec..9e5b567f3a44 100644
--- a/java/java-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspection.java
+++ b/java/java-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspection.java
@@ -358,7 +358,7 @@ public class NullableStuffInspection extends BaseLocalInspectionTool {
           if (!methodQuickFixSuggested
               && annotated.isDeclaredNotNull
               && !nullableManager.isNotNull(overriding, false) 
-              && !nullableManager.isNullable(overriding, true)) {
+              && (nullableManager.isNullable(overriding, false) || !nullableManager.isNullable(overriding, true))) {
             method.getNameIdentifier(); //load tree
             PsiAnnotation annotation = AnnotationUtil.findAnnotation(method, nullableManager.getNotNulls());
             final String defaultNotNull = nullableManager.getDefaultNotNull();