From 6367299e64d907c83803dd26e671eda38bcba352 Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Tue, 27 Dec 2011 19:24:11 +0100
Subject: [PATCH] EA-32199 - IOE:
 PsiJavaParserFacadeImpl.createExpressionFromText(cherry picked from commit
 52f323e)

---
 .../daemon/impl/quickfix/SimplifyBooleanExpressionFix.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SimplifyBooleanExpressionFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SimplifyBooleanExpressionFix.java
index 096fdc09a8f5..c553a64486c0 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SimplifyBooleanExpressionFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SimplifyBooleanExpressionFix.java
@@ -255,7 +255,7 @@ public class SimplifyBooleanExpressionFix implements IntentionAction {
         }
         else {
           final PsiJavaToken javaToken = expression.getTokenBeforeOperand(operand);
-          if (javaToken != null && !PsiTreeUtil.hasErrorElements(operand)) {
+          if (javaToken != null && !PsiTreeUtil.hasErrorElements(operand) && !PsiTreeUtil.hasErrorElements(lExpr)) {
             resultExpression = JavaPsiFacade.getElementFactory(expression.getProject()).createExpressionFromText(lExpr.getText() + javaToken.getText() + operand.getText(), expression);
           } else {
             resultExpression = null;