Author: carnold
Date: Thu Aug 7 20:22:45 2008
New Revision: 683824
URL: http://svn.apache.org/viewvc?rev=683824&view=rev
Log:
Bug 45335: NPE in NDC.remove after unload by Tomcat
Modified:
logging/log4j/trunk/src/changes/changes.xml
logging/log4j/trunk/src/main/java/org/apache/log4j/NDC.java
Modified: logging/log4j/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/logging/log4j/trunk/src/changes/changes.xml?rev=683824&r1=683823&r2=683824&view=diff
==============================================================================
--- logging/log4j/trunk/src/changes/changes.xml (original)
+++ logging/log4j/trunk/src/changes/changes.xml Thu Aug 7 20:22:45 2008
@@ -45,6 +45,7 @@
<action action="fix" issue="37182">Exception in call to toString of
message propagates to caller.</action>
<action action="fix" issue="45299">Javadoc class index corrupted by
JDBCAppender deprecation warning.</action>
<action action="fix" issue="43867">Improve warning message when log4j
is accessed after unload by Tomcat.</action>
+ <action action="fix" issue="45335">NullPointerException in NDC.remove
after unload by Tomcat.</action>
</release>
<release version="1.2.15" date="2007-08-24" description="SyslogAppender
enhancements, NTEventLogAppender and Maven build.">
Modified: logging/log4j/trunk/src/main/java/org/apache/log4j/NDC.java
URL:
http://svn.apache.org/viewvc/logging/log4j/trunk/src/main/java/org/apache/log4j/NDC.java?rev=683824&r1=683823&r2=683824&view=diff
==============================================================================
--- logging/log4j/trunk/src/main/java/org/apache/log4j/NDC.java (original)
+++ logging/log4j/trunk/src/main/java/org/apache/log4j/NDC.java Thu Aug 7
20:22:45 2008
@@ -374,10 +374,12 @@
static
public
void remove() {
- ht.remove(Thread.currentThread());
+ if (ht != null) {
+ ht.remove(Thread.currentThread());
- // Lazily remove dead-thread references in ht.
- lazyRemove();
+ // Lazily remove dead-thread references in ht.
+ lazyRemove();
+ }
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
