From e4a93ccf13cf32f76ca67271d9a357cff8f58bd8 Mon Sep 17 00:00:00 2001
From: Jakub Chrzanowski <jakub.chrzanowski@jetbrains.com>
Date: Thu, 16 Apr 2020 11:17:22 +0200
Subject: [PATCH] [Code Samples Inspection] Java > Control flow issues >
 Redundant 'if' statement

---
 .../sdk/intention/ConditionalOperatorConverter.java        | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/conditional_operator_intention/src/main/java/org/intellij/sdk/intention/ConditionalOperatorConverter.java b/conditional_operator_intention/src/main/java/org/intellij/sdk/intention/ConditionalOperatorConverter.java
index a492b1af6..4f5df5745 100644
--- a/conditional_operator_intention/src/main/java/org/intellij/sdk/intention/ConditionalOperatorConverter.java
+++ b/conditional_operator_intention/src/main/java/org/intellij/sdk/intention/ConditionalOperatorConverter.java
@@ -70,11 +70,8 @@ public class ConditionalOperatorConverter extends PsiElementBaseIntentionAction
       // Is this token part of a fully formed conditional, i.e. a ternary?
       if (token.getParent() instanceof PsiConditionalExpression) {
         final PsiConditionalExpression conditionalExpression = (PsiConditionalExpression) token.getParent();
-        if (conditionalExpression.getThenExpression() == null
-            || conditionalExpression.getElseExpression() == null) {
-          return false;
-        }
-        return true;    // Satisfies all criteria; call back invoke method
+        return conditionalExpression.getThenExpression() != null
+                && conditionalExpression.getElseExpression() != null;// Satisfies all criteria; call back invoke method
       }
       return false;
     }