Author: carnold
Date: Mon May 12 13:51:36 2008
New Revision: 655636
URL: http://svn.apache.org/viewvc?rev=655636&view=rev
Log:
LOGCXX-278: Threads for reconnecting sockets do not end cleanly when program
exits
Modified:
logging/log4cxx/trunk/src/main/cpp/socketappenderskeleton.cpp
Modified: logging/log4cxx/trunk/src/main/cpp/socketappenderskeleton.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/socketappenderskeleton.cpp?rev=655636&r1=655635&r2=655636&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/socketappenderskeleton.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/socketappenderskeleton.cpp Mon May 12
13:51:36 2008
@@ -65,6 +65,11 @@
SocketAppenderSkeleton::~SocketAppenderSkeleton()
{
finalize();
+ try {
+ thread.join();
+ } catch(ThreadException& ex) {
+ LogLog::error(LOG4CXX_STR("Error closing socket appender
connection thread"), ex);
+ }
}
void SocketAppenderSkeleton::activateOptions(Pool& p)
@@ -79,7 +84,6 @@
closed = true;
cleanUp(pool);
thread.interrupt();
- thread.join();
}
void SocketAppenderSkeleton::connect(Pool& p) {
