From 498b450d3390e29d4669eb269b55a82075cbe34b Mon Sep 17 00:00:00 2001 From: peter Date: Sun, 10 Oct 2010 17:58:22 +0400 Subject: [PATCH] fix NPE on groovy evaluation --- .../engine/evaluation/expression/IfStatementEvaluator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/IfStatementEvaluator.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/IfStatementEvaluator.java index 4f5709d47fc3..7d518a0c3591 100644 --- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/IfStatementEvaluator.java +++ b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/IfStatementEvaluator.java @@ -33,7 +33,7 @@ public class IfStatementEvaluator implements Evaluator { public IfStatementEvaluator(Evaluator conditionEvaluator, Evaluator thenEvaluator, Evaluator elseEvaluator) { myConditionEvaluator = new DisableGC(conditionEvaluator); myThenEvaluator = new DisableGC(thenEvaluator); - myElseEvaluator = new DisableGC(elseEvaluator); + myElseEvaluator = elseEvaluator == null ? null : new DisableGC(elseEvaluator); } public Modifier getModifier() {