Author: carnold
Date: Mon Mar 24 12:36:09 2008
New Revision: 640538
URL: http://svn.apache.org/viewvc?rev=640538&view=rev
Log:
LOGCXX-246: Wrap Thread::join in try/catch
Modified:
logging/log4cxx/trunk/src/main/cpp/telnetappender.cpp
Modified: logging/log4cxx/trunk/src/main/cpp/telnetappender.cpp
URL:
http://svn.apache.org/viewvc/logging/log4cxx/trunk/src/main/cpp/telnetappender.cpp?rev=640538&r1=640537&r2=640538&view=diff
==============================================================================
--- logging/log4cxx/trunk/src/main/cpp/telnetappender.cpp (original)
+++ logging/log4cxx/trunk/src/main/cpp/telnetappender.cpp Mon Mar 24 12:36:09
2008
@@ -116,7 +116,10 @@
}
}
- sh.join();
+ try {
+ sh.join();
+ } catch(Exception& ex) {
+ }
activeConnections = 0;
}