You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2015/08/18 12:07:50 UTC
logging-log4j2 git commit: Test null input and avoid NPEs.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 142159be4 -> 4520f95b4
Test null input and avoid NPEs.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4520f95b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4520f95b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4520f95b
Branch: refs/heads/master
Commit: 4520f95b47c6e484817449a7c1111337038afb5a
Parents: 142159b
Author: ggregory <gg...@apache.org>
Authored: Tue Aug 18 03:07:40 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Tue Aug 18 03:07:40 2015 -0700
----------------------------------------------------------------------
.../logging/log4j/core/config/AbstractConfiguration.java | 2 +-
.../main/java/org/apache/logging/log4j/core/util/NameUtil.java | 2 +-
.../apache/logging/log4j/core/config/ConfigurationTest.java | 6 ++++++
3 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4520f95b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
index 2218166..599fd9a 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AbstractConfiguration.java
@@ -625,7 +625,7 @@ public abstract class AbstractConfiguration extends AbstractFilterable implement
*/
@Override
public LoggerConfig getLoggerConfig(final String name) {
- LoggerConfig loggerConfig = loggers.get(name);
+ LoggerConfig loggerConfig = name == null ? null : loggers.get(name);
if (loggerConfig != null) {
return loggerConfig;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4520f95b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NameUtil.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NameUtil.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NameUtil.java
index de2e092..4d4cfcc 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NameUtil.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/util/NameUtil.java
@@ -31,7 +31,7 @@ public final class NameUtil {
}
public static String getSubName(final String name) {
- if (name.isEmpty()) {
+ if (Strings.isEmpty(name)) {
return null;
}
final int i = name.lastIndexOf('.');
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4520f95b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/ConfigurationTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/ConfigurationTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/ConfigurationTest.java
index e491d79..46d569a 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/ConfigurationTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/ConfigurationTest.java
@@ -100,6 +100,12 @@ public class ConfigurationTest {
}
@Test
+ public void testGetLoggerConfigNull() throws Exception {
+ final Configuration config = this.ctx.getConfiguration();
+ assertEquals(config.getRootLogger(), config.getLoggerConfig(null));
+ }
+
+ @Test
public void testLogger() throws Exception {
final Logger logger = this.ctx.getLogger(LOGGER_NAME);
assertThat(logger, is(instanceOf(org.apache.logging.log4j.core.Logger.class)));