From 7138d731ce2bc90df35e533b701e50062864464b Mon Sep 17 00:00:00 2001 From: Michal Kordas Date: Sun, 22 Mar 2015 23:11:58 +0100 Subject: [PATCH] Remove null checks on previously dereferenced values, issue #778 Violations of Findbugs rule [RCN: Nullcheck of value previously dereferenced](http://findbugs.sourceforge.net/bugDescriptions.html#RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE) in class `BlockParentHandler` are fixed. --- .../checkstyle/checks/indentation/BlockParentHandler.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/BlockParentHandler.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/BlockParentHandler.java index 780a10259..b3e273a15 100644 --- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/BlockParentHandler.java +++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/indentation/BlockParentHandler.java @@ -173,10 +173,7 @@ public class BlockParentHandler extends ExpressionHandler final DetailAST lcurly = getLCurly(); final int lcurlyPos = expandedTabsColumnNo(lcurly); - if (lcurly == null - || curlyLevel().accept(lcurlyPos) - || !startsLine(lcurly)) - { + if (curlyLevel().accept(lcurlyPos) || !startsLine(lcurly)) { return; } @@ -224,8 +221,7 @@ public class BlockParentHandler extends ExpressionHandler final DetailAST rcurly = getRCurly(); final int rcurlyPos = expandedTabsColumnNo(rcurly); - if (rcurly == null - || curlyLevel().accept(rcurlyPos) + if (curlyLevel().accept(rcurlyPos) || !rcurlyMustStart() && !startsLine(rcurly) || areOnSameLine(rcurly, lcurly)) {