Merge in fixes for SASL.

[m6w6/libmemcached] / libtest / signal.cc

diff --git a/libtest/signal.cc b/libtest/signal.cc
index 50234d8d9b1921a47ed821fce4b86959f3cf05a0..ed017b2befe10ff6769435c756544a2381a9513a 100644 (file)
--- a/libtest/signal.cc
+++ b/libtest/signal.cc
@@ -85,11 +85,18 @@ void SignalThread::test()
 
 SignalThread::~SignalThread()
 {
+  if (not is_shutdown())
+  {
+    set_shutdown(SHUTDOWN_GRACEFUL);
+  }
+
+#if 0
   if (pthread_equal(thread, pthread_self()) != 0 and (pthread_kill(thread, 0) == ESRCH) == true)
   {
     void *retval;
     pthread_join(thread, &retval);
   }
+#endif
   sem_destroy(&lock);
 }