BUG-4109: Correct checkstyle dependency and avoid a couple of NPEs

[yangtools.git] / common / checkstyle-logging / src / main / java / org / opendaylight / yangtools / checkstyle / LoggerVariableNameCheck.java

diff --git a/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerVariableNameCheck.java b/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerVariableNameCheck.java
index 7569f141dd3ca203e8e1f6ef68b2f2c056f06e79..6e69da05880c0762b7ce52a185db85bca624571b 100644 (file)
--- a/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerVariableNameCheck.java
+++ b/common/checkstyle-logging/src/main/java/org/opendaylight/yangtools/checkstyle/LoggerVariableNameCheck.java
@@ -25,8 +25,8 @@ public class LoggerVariableNameCheck extends Check {
 
     @Override
     public void visitToken(DetailAST aAST) {
-        final String variableName = CheckLoggingUtil.getVariableName(aAST);
-        if (CheckLoggingUtil.itsAFieldVariable(aAST) && CheckLoggingUtil.isLoggerType(aAST) && !variableName.equals(LOGGER_VAR_NAME)) {
+        if (CheckLoggingUtil.isAFieldVariable(aAST) && CheckLoggingUtil.isLoggerType(aAST)
+                && !LOGGER_VAR_NAME.equals(CheckLoggingUtil.getVariableName(aAST))) {
             log(aAST.getLineNo(), LOG_MESSAGE);
         }
     }