Issue #3655: Fix NPE in NeedBraces on single line default stmt

checkstyle · Dec 21, 2016 · a882e6a · a882e6a
1 parent d24405c
commit a882e6a
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/NeedBracesCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/blocks/NeedBracesCheck.java
@@ -442,9 +442,14 @@ private static boolean isSingleLineCase(DetailAST literalCase) {
     private static boolean isSingleLineDefault(DetailAST literalDefault) {
         boolean result = false;
         final DetailAST slist = literalDefault.getNextSibling();
-        final DetailAST block = slist.getFirstChild();
-        if (block.getType() != TokenTypes.SLIST) {
-            result = literalDefault.getLineNo() == block.getLineNo();
+        if (slist == null) {
+            result = true;
+        }
+        else {
+            final DetailAST block = slist.getFirstChild();
+            if (block.getType() != TokenTypes.SLIST) {
+                result = literalDefault.getLineNo() == block.getLineNo();
+            }
         }
         return result;
     }

diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/NeedBracesCheckTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/checks/blocks/NeedBracesCheckTest.java
@@ -178,4 +178,14 @@ public void testAllowEmptyLoopBodyFalse() throws Exception {
         };
         verify(checkConfig, getPath("InputNeedBracesNoBodyLoops.java"), expected);
     }
+
+    @Test
+    public void testEmptySingleLineDefaultStmt() throws Exception {
+        final DefaultConfiguration checkConfig = createCheckConfig(NeedBracesCheck.class);
+        checkConfig.addAttribute("tokens", "LITERAL_DEFAULT");
+        checkConfig.addAttribute("allowSingleLineStatement", "true");
+        final String[] expected = {
+        };
+        verify(checkConfig, getPath("InputNeedBracesEmptyDefault.java"), expected);
+    }
 }
diff --git a/.../resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputNeedBracesEmptyDefault.java b/.../resources/com/puppycrawl/tools/checkstyle/checks/blocks/InputNeedBracesEmptyDefault.java
@@ -0,0 +1,9 @@
+package com.puppycrawl.tools.checkstyle.checks.blocks;
+
+public class InputNeedBracesEmptyDefault {
+    private static void main() {
+        switch (5) {
+            default:
+        }
+    }
+}