From 7053187802eea9797ae3abdb14a8c4a026d7eaf7 Mon Sep 17 00:00:00 2001 From: oyarzun Date: Mon, 22 Jun 2015 14:38:13 -0400 Subject: [PATCH] Fixes #354 NullPointerException Fixes #354 NullPointerException in AvoidNotShortCircuitOperatorsForBooleanCheck --- .../coding/AvoidNotShortCircuitOperatorsForBooleanCheck.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/coding/AvoidNotShortCircuitOperatorsForBooleanCheck.java b/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/coding/AvoidNotShortCircuitOperatorsForBooleanCheck.java index b46ea09b8f..301eafd662 100644 --- a/sevntu-checks/src/main/java/com/github/sevntu/checkstyle/checks/coding/AvoidNotShortCircuitOperatorsForBooleanCheck.java +++ b/sevntu-checks/src/main/java/com/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()); }