diff --git a/java/java-impl/src/com/intellij/psi/controlFlow/ControlFlowAnalyzer.java b/java/java-impl/src/com/intellij/psi/controlFlow/ControlFlowAnalyzer.java
index 502a9e49d761..858707bacaf9 100644
--- a/java/java-impl/src/com/intellij/psi/controlFlow/ControlFlowAnalyzer.java
+++ b/java/java-impl/src/com/intellij/psi/controlFlow/ControlFlowAnalyzer.java
@@ -1306,9 +1306,11 @@ class ControlFlowAnalyzer extends JavaJspElementVisitor {
 
     final PsiExpression lOperand = expression.getLOperand();
     final PsiExpression rOperand = expression.getROperand();
-    IElementType signTokenType = expression.getOperationSign().getTokenType();
+    IElementType signTokenType = expression.getOperationTokenType();
 
-    if ((signTokenType == JavaTokenType.ANDAND || signTokenType == JavaTokenType.OROR) && myEnabledShortCircuit) {
+    boolean isAndAnd = signTokenType == JavaTokenType.ANDAND;
+    boolean isOrOr = signTokenType == JavaTokenType.OROR;
+    if ((isAndAnd || isOrOr) && myEnabledShortCircuit) {
       Object exprValue = myConstantEvaluationHelper.computeConstantExpression(lOperand);
       Boolean lvalue = null;
       if (exprValue instanceof Boolean) {
@@ -1322,24 +1324,20 @@ class ControlFlowAnalyzer extends JavaJspElementVisitor {
         rvalue = shouldCalculateConstantExpression(expression) ? (Boolean)exprValue : null;
       }
       Boolean doShortcut;
-      boolean shouldGenLOperand = true;
       if (lvalue != null) {
-        doShortcut = lvalue.booleanValue() != (signTokenType == JavaTokenType.ANDAND);
+        doShortcut = lvalue.booleanValue() != isAndAnd;
       }
-      else if (rvalue != null && rvalue.booleanValue() != (signTokenType == JavaTokenType.ANDAND)) {
+      else if (rvalue != null && rvalue.booleanValue() != isAndAnd) {
         doShortcut = Boolean.TRUE;
-        shouldGenLOperand = false; // case of 'if (x && false)...'
       }
       else {
         doShortcut = null;
       }
         
-      if (shouldGenLOperand) {
-        generateLOperand(lOperand, rOperand, signTokenType);
-      }
-      BranchingInstruction.Role role = signTokenType == JavaTokenType.ANDAND ? myEndJumpRoles.peek() : myStartJumpRoles.peek();
-      PsiElement gotoElement = signTokenType == JavaTokenType.ANDAND ? myEndStatementStack.peekElement() : myStartStatementStack.peekElement();
-      boolean gotoIsAtStart = signTokenType == JavaTokenType.ANDAND ? myEndStatementStack.peekAtStart() : myStartStatementStack.peekAtStart();
+      generateLOperand(lOperand, rOperand, signTokenType);
+      BranchingInstruction.Role role = isAndAnd ? myEndJumpRoles.peek() : myStartJumpRoles.peek();
+      PsiElement gotoElement = isAndAnd ? myEndStatementStack.peekElement() : myStartStatementStack.peekElement();
+      boolean gotoIsAtStart = isAndAnd ? myEndStatementStack.peekAtStart() : myStartStatementStack.peekAtStart();
       if (doShortcut == null) {
         myCurrentFlow.addInstruction(new ConditionalGoToInstruction(0, role, lOperand));
         addElementOffsetLater(gotoElement, gotoIsAtStart);
@@ -1360,15 +1358,15 @@ class ControlFlowAnalyzer extends JavaJspElementVisitor {
     finishElement(expression);
   }
 
-  private void generateLOperand(PsiExpression lOperand, PsiExpression rOperand, IElementType signTokenType) {
+  private void generateLOperand(@NotNull PsiExpression lOperand, PsiExpression rOperand, IElementType signTokenType) {
     if (rOperand != null) {
       myStartJumpRoles.push(BranchingInstruction.Role.END);
       myEndJumpRoles.push(BranchingInstruction.Role.END);
       PsiElement then = signTokenType == JavaTokenType.OROR ? myStartStatementStack.peekElement() : rOperand;
-      boolean thenAtStart = signTokenType == JavaTokenType.OROR ? myStartStatementStack.peekAtStart() : true;
+      boolean thenAtStart = signTokenType != JavaTokenType.OROR || myStartStatementStack.peekAtStart();
       myStartStatementStack.pushStatement(then, thenAtStart);
       PsiElement elseS = signTokenType == JavaTokenType.ANDAND ? myEndStatementStack.peekElement() : rOperand;
-      boolean elseAtStart = signTokenType == JavaTokenType.ANDAND ? myEndStatementStack.peekAtStart() : true;
+      boolean elseAtStart = signTokenType != JavaTokenType.ANDAND || myEndStatementStack.peekAtStart();
       myEndStatementStack.pushStatement(elseS, elseAtStart);
     }
     lOperand.accept(this);
diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/LocalVariableInitialization.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/LocalVariableInitialization.java
index 50ce6dabb281..7b6e40003652 100644
--- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/LocalVariableInitialization.java
+++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/advHighlighting/LocalVariableInitialization.java
@@ -328,11 +328,11 @@ public class a  {
         }
     }
     void cfx3() {
-        boolean b;
-        boolean c;// = true;
-        if (c && false) {
-            c = b;
-        }
+      boolean b;
+      boolean c;// = true;
+      if (<error descr="Variable 'c' might not have been initialized">c</error> && false) {
+          c = b;
+      }
     }
     void cfx4()
     {