Fixes #354 NullPointerException

Fixes #354 NullPointerException in AvoidNotShortCircuitOperatorsForBooleanCheck
sevntu-checkstyle · Sep 7, 2015 · 7053187 · 7053187
1 parent e746395
commit 7053187
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/.../github/sevntu/checkstyle/checks/coding/AvoidNotShortCircuitOperatorsForBooleanCheck.java b/.../github/sevntu/checkstyle/checks/coding/AvoidNotShortCircuitOperatorsForBooleanCheck.java
@@ -116,12 +116,12 @@ public final void visitToken(final DetailAST detailAST)
 
         DetailAST currentNode = detailAST;
         // look for EXPR which is always around BOR/BAND... operators
-        while (currentNode.getType() != TokenTypes.EXPR)
+        while (currentNode != null && currentNode.getType() != TokenTypes.EXPR)
         {
             currentNode = currentNode.getParent();
         }
 
-        if (isBooleanExpression(currentNode)) {
+        if (currentNode != null && isBooleanExpression(currentNode)) {
             log(detailAST, MSG_KEY, detailAST.getText());
         }