You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2016/08/28 10:31:58 UTC
[22/50] [abbrv] logging-log4j2 git commit: [LOG4J2-1547] The Core
AbstractConfiguration should track its LoggerContext.
[LOG4J2-1547] The Core AbstractConfiguration should track its
LoggerContext.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/322ccf0f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/322ccf0f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/322ccf0f
Branch: refs/heads/LOG4J2-1528
Commit: 322ccf0f63128ac2f08db2d1bdb5e93bd6cb8f49
Parents: acbecc0
Author: Gary Gregory <gg...@apache.org>
Authored: Thu Aug 25 14:37:24 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Thu Aug 25 14:37:24 2016 -0700
----------------------------------------------------------------------
.../org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java | 4 ++--
.../apache/logging/log4j/core/config/AbstractConfiguration.java | 3 ++-
.../logging/log4j/core/config/plugins/util/ResolverUtilTest.java | 2 +-
3 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/322ccf0f/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java
----------------------------------------------------------------------
diff --git a/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java b/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java
index 667bac2..ea55dd9 100644
--- a/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java
+++ b/log4j-1.2-api/src/test/java/org/apache/log4j/config/Log4j1ConfigurationFactoryTest.java
@@ -53,8 +53,8 @@ public class Log4j1ConfigurationFactoryTest {
private Layout<?> testFile(final String configResource) throws Exception {
final URL configLocation = ClassLoader.getSystemResource(configResource);
assertNotNull(configLocation);
- final Configuration configuration = new Log4j1ConfigurationFactory().getConfiguration("test",
- configLocation.toURI());
+ final Configuration configuration = new Log4j1ConfigurationFactory().getConfiguration(null,
+ "test", configLocation.toURI());
assertNotNull(configuration);
final FileAppender appender = configuration.getAppender("File");
assertNotNull(appender);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/322ccf0f/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 d452396..0e053a1 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
@@ -131,7 +131,8 @@ public abstract class AbstractConfiguration extends AbstractFilterable implement
*/
protected AbstractConfiguration(LoggerContext loggerContext, final ConfigurationSource configurationSource) {
this.loggerContext = new WeakReference<>(loggerContext);
- //this.loggerContext = new WeakReference(Objects.requireNonNull(loggerContext, "loggerContext is null"));
+ // The loggerContext is null for the NullConfiguration class.
+ // this.loggerContext = new WeakReference(Objects.requireNonNull(loggerContext, "loggerContext is null"));
this.configurationSource = Objects.requireNonNull(configurationSource, "configurationSource is null");
componentMap.put(Configuration.CONTEXT_PROPERTIES, properties);
pluginManager = new PluginManager(Node.CATEGORY);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/322ccf0f/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilTest.java
index f5d13eb..c0f1e3a 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtilTest.java
@@ -200,7 +200,7 @@ public class ResolverUtilTest {
static void createJar(URI jarURI, File workDir, File f) throws Exception {
Map<String, String> env = new HashMap<>();
env.put("create", "true");
- URI uri = URI.create("jar:file://" + jarURI.getPath());
+ URI uri = URI.create("jar:file://" + jarURI.getRawPath());
try (FileSystem zipfs = FileSystems.newFileSystem(uri, env)) {
Path path = zipfs.getPath(workDir.toPath().relativize(f.toPath()).toString());
if (path.getParent() != null) {