Author: rpopma
Date: Sun Jan 5 21:23:41 2014
New Revision: 1555633
URL: http://svn.apache.org/r1555633
Log:
LOG4J2-377 (OSGi) Fix NPE during shutdown.
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
logging/log4j/log4j2/trunk/src/changes/changes.xml
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java?rev=1555633&r1=1555632&r2=1555633&view=diff
==============================================================================
---
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
(original)
+++
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/LoggerContext.java
Sun Jan 5 21:23:41 2014
@@ -53,6 +53,7 @@ public class LoggerContext implements or
public static final String PROPERTY_CONFIG = "config";
private static final StatusLogger LOGGER = StatusLogger.getLogger();
+ private static final Configuration NULL_CONFIGURATION = new
NullConfiguration();
private final ConcurrentMap<String, Logger> loggers = new
ConcurrentHashMap<String, Logger>();
private final CopyOnWriteArrayList<PropertyChangeListener>
propertyChangeListeners = new CopyOnWriteArrayList<PropertyChangeListener>();
@@ -208,7 +209,7 @@ public class LoggerContext implements or
shutdownThread = null;
}
final Configuration prev = config;
- config = new NullConfiguration();
+ config = NULL_CONFIGURATION;
updateLoggers();
prev.stop();
externalContext = null;
Modified: logging/log4j/log4j2/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/src/changes/changes.xml?rev=1555633&r1=1555632&r2=1555633&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/src/changes/changes.xml (original)
+++ logging/log4j/log4j2/trunk/src/changes/changes.xml Sun Jan 5 21:23:41 2014
@@ -21,6 +21,9 @@
</properties>
<body>
<release version="2.0-RC1" date="2013-MM-DD" description="Bug fixes and
enhancements">
+ <action issue="LOG4J2-377" dev="rpopma" type="fix" due-to="Roland
Weiglhofer, Matt Sicker">
+ (OSGi) Fix NPE during shutdown.
+ </action>
<action issue="LOG4J2-463" dev="rpopma" type="fix" due-to="Michael
Diamond, Matt Sicker">
Fixed documentation for MyApp example application in the Automatic
Configuration section
</action>
