diff options
| author | Andy Clement | 2016-01-19 00:03:37 +0000 |
|---|---|---|
| committer | Andy Clement | 2016-01-19 00:03:37 +0000 |
| commit | be55629bdc64ac05196b553ebc9b534688cbe4bd (patch) | |
| tree | 74ce4c54cc4f0b62c3792fb377462bedfa37dec1 | |
| parent | 49e9dbf1f793072f6b2feebc3df09e83ed16edb9 (diff) | |
| download | org.aspectj.shadows-aj_BETA_JAVA8_LUNA_2b07958.tar.gz org.aspectj.shadows-aj_BETA_JAVA8_LUNA_2b07958.tar.xz org.aspectj.shadows-aj_BETA_JAVA8_LUNA_2b07958.zip | |
Fix 486203: NPE in IntelliJ since 1.8.7aj_BETA_JAVA8_LUNA_2b07958
| -rw-r--r-- | org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/DoStatement.java | 4 | ||||
| -rw-r--r-- | org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/WhileStatement.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/DoStatement.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/DoStatement.java index 2f82ac2c..4f9cd465 100644 --- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/DoStatement.java +++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/DoStatement.java @@ -232,9 +232,9 @@ public void traverse(ASTVisitor visitor, BlockScope scope) { @Override public boolean doesNotCompleteNormally() { Constant cst = this.condition.constant; - boolean isConditionTrue = cst != Constant.NotAConstant && cst.booleanValue() == true; + boolean isConditionTrue = cst == null || cst != Constant.NotAConstant && cst.booleanValue() == true; cst = this.condition.optimizedBooleanConstant(); - boolean isConditionOptimizedTrue = cst != Constant.NotAConstant && cst.booleanValue() == true; + boolean isConditionOptimizedTrue = cst == null ? true : cst != Constant.NotAConstant && cst.booleanValue() == true; if (isConditionTrue || isConditionOptimizedTrue) return this.action == null || !this.action.breaksOut(null); diff --git a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/WhileStatement.java b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/WhileStatement.java index ce709c9f..07cd8010 100644 --- a/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/WhileStatement.java +++ b/org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/WhileStatement.java @@ -291,9 +291,9 @@ public class WhileStatement extends Statement { @Override public boolean doesNotCompleteNormally() { Constant cst = this.condition.constant; - boolean isConditionTrue = cst != Constant.NotAConstant && cst.booleanValue() == true; + boolean isConditionTrue = cst == null || cst != Constant.NotAConstant && cst.booleanValue() == true; cst = this.condition.optimizedBooleanConstant(); - boolean isConditionOptimizedTrue = cst != Constant.NotAConstant && cst.booleanValue() == true; + boolean isConditionOptimizedTrue = cst == null ? true : cst != Constant.NotAConstant && cst.booleanValue() == true; return (isConditionTrue || isConditionOptimizedTrue) && (this.action == null || !this.action.breaksOut(null)); } |