From 8923cb32981bc0b227453608e902448aa67e42de Mon Sep 17 00:00:00 2001 From: Brian Showers Date: Mon, 8 Oct 2012 17:40:28 -0500 Subject: [PATCH] Fix NPE in JULHelper.asJULLevel --- .../src/main/java/ch/qos/logback/classic/jul/JULHelper.java | 3 +++ .../ch/qos/logback/classic/jul/LevelChangePropagatorTest.java | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/logback-classic/src/main/java/ch/qos/logback/classic/jul/JULHelper.java b/logback-classic/src/main/java/ch/qos/logback/classic/jul/JULHelper.java index 0ee1afb..a0a98a4 100644 --- a/logback-classic/src/main/java/ch/qos/logback/classic/jul/JULHelper.java +++ b/logback-classic/src/main/java/ch/qos/logback/classic/jul/JULHelper.java @@ -32,6 +32,9 @@ public class JULHelper { } static public java.util.logging.Level asJULLevel(Level lbLevel) { + if (lbLevel == null) + return null; + switch (lbLevel.levelInt) { case Level.ALL_INT: return java.util.logging.Level.ALL; diff --git a/logback-classic/src/test/java/ch/qos/logback/classic/jul/LevelChangePropagatorTest.java b/logback-classic/src/test/java/ch/qos/logback/classic/jul/LevelChangePropagatorTest.java index ddfe00c..70145d3 100644 --- a/logback-classic/src/test/java/ch/qos/logback/classic/jul/LevelChangePropagatorTest.java +++ b/logback-classic/src/test/java/ch/qos/logback/classic/jul/LevelChangePropagatorTest.java @@ -66,4 +66,10 @@ public class LevelChangePropagatorTest { assertEquals(julLevel, julLogger.getLevel()); } + @Test + public void nullLevel() { + checkLevelChange("a", Level.INFO); + checkLevelChange("a", null); + } + } -- 1.7.10.msysgit.1