You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2015/08/31 06:37:26 UTC
[05/12] logging-log4j2 git commit: [LOG4J2-1108] NullPointerException
when passing null to java.util.logging.Logger.setLevel().
[LOG4J2-1108] NullPointerException when passing null to
java.util.logging.Logger.setLevel().
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f14bc486
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f14bc486
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f14bc486
Branch: refs/heads/LOG4J2-952
Commit: f14bc4867f703ff431b39e1c748b790bd063243e
Parents: de0b802
Author: ggregory <gg...@apache.org>
Authored: Fri Aug 28 12:25:20 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Fri Aug 28 12:25:20 2015 -0700
----------------------------------------------------------------------
.../src/main/java/org/apache/logging/log4j/core/Logger.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f14bc486/log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java
index bf36905..91ce841 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/Logger.java
@@ -104,11 +104,8 @@ public class Logger extends AbstractLogger {
* @param level The Level to use on this Logger, may be null.
*/
public synchronized void setLevel(final Level level) {
- if (level != null) {
- config = new PrivateConfig(config, level);
- } else {
- config = new PrivateConfig(config, getParent().getLevel());
- }
+ final Level actualLevel = level != null ? level : getParent().getLevel();
+ config = new PrivateConfig(config, actualLevel);
}
@Override