svn commit: r1566664 - in /incubator/log4cxx/trunk/src: changes/changes.xml main/cpp/aprinitializer.cpp

[ts...@apache.org]

Author: tschoening
Date: Mon Feb 10 15:51:12 2014
New Revision: 1566664

URL: http://svn.apache.org/r1566664
Log:
LOGCXX-320: TLS memory of APR is not freed in destructor of APRInitializer

Modified:
    incubator/log4cxx/trunk/src/changes/changes.xml
    incubator/log4cxx/trunk/src/main/cpp/aprinitializer.cpp

Modified: incubator/log4cxx/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/changes/changes.xml?rev=1566664&r1=1566663&r2=1566664&view=diff
==============================================================================
--- incubator/log4cxx/trunk/src/changes/changes.xml (original)
+++ incubator/log4cxx/trunk/src/changes/changes.xml Mon Feb 10 15:51:12 2014
@@ -57,6 +57,7 @@
 			<action issue="LOGCXX-313" type="fix">Build process fails in case of absence of iconv support in apr-util</action>
 			<action issue="LOGCXX-317" type="fix">Log4cxx triggers locking inversion which can result in a deadlock.</action>
 			<action issue="LOGCXX-319" type="fix">Please make sure that the LOG4CXX_* macro's can be used as ordinary statements.</action>
+			<action issue="LOGCXX-320" type="fix">TLS memory of APR is not freed in destructor of APRInitializer</action>
 			<action issue="LOGCXX-331" type="fix">DailyRollingFileAppender should roll if program doesn't run at rolling time</action>
 			<action issue="LOGCXX-336" type="fix">Test compilation fails: Overloading ambiguity</action>
 			<action issue="LOGCXX-337" type="fix">Suggested fix for socketappender not reconnecting multiple times</action>

Modified: incubator/log4cxx/trunk/src/main/cpp/aprinitializer.cpp
URL: http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/cpp/aprinitializer.cpp?rev=1566664&r1=1566663&r2=1566664&view=diff
==============================================================================
--- incubator/log4cxx/trunk/src/main/cpp/aprinitializer.cpp (original)
+++ incubator/log4cxx/trunk/src/main/cpp/aprinitializer.cpp Mon Feb 10 15:51:12 2014
@@ -57,6 +57,7 @@ APRInitializer::~APRInitializer() {
     {
 #if APR_HAS_THREADS
         synchronized sync(mutex);
+        apr_threadkey_private_delete();
 #endif
         for(std::vector<FileWatchdog*>::iterator iter = watchdogs.begin();
             iter != watchdogs.end();