Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"

1 files changed, 4 insertions, 0 deletions

diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/InstanceOfUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/InstanceOfUtils.java
index 702d84d522ac..fdbc531406de 100644
--- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/InstanceOfUtils.java
+++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/InstanceOfUtils.java
@@ -117,6 +117,9 @@ public class InstanceOfUtils {
             inElse = true;
           }
           checkExpression(operand);
+          if (agreeingInstanceof) {
+            return;
+          }
         }
         if (inElse && conflictingInstanceof != null) {
           agreeingInstanceof = false;
@@ -215,6 +218,7 @@ public class InstanceOfUtils {
         (PsiInstanceOfExpression)expression;
       if (isAgreeing(instanceOfExpression)) {
         agreeingInstanceof = true;
+        conflictingInstanceof = null;
       }
       else if (isConflicting(instanceOfExpression)) {
         conflictingInstanceof = instanceOfExpression;