Ensure the dispatch thread has terminated before destroying the std::thread

Author: stephen-webb

src/main/cpp/asyncappender.cpp

@@ -115,20 +115,21 @@ typedef std::map<LogString, DiscardSummary> DiscardMap;
 
 struct AsyncAppender::AsyncAppenderPriv : public AppenderSkeleton::AppenderSkeletonPrivate
 {
-	AsyncAppenderPriv() :
-		AppenderSkeletonPrivate(),
-		buffer(DEFAULT_BUFFER_SIZE),
-		bufferSize(DEFAULT_BUFFER_SIZE),
-		dispatcher(),
-		locationInfo(false),
-		blocking(true)
-#if LOG4CXX_EVENTS_AT_EXIT
-		, atExitRegistryRaii([this]{stopDispatcher();})
-#endif
+	AsyncAppenderPriv()
+		: AppenderSkeletonPrivate()
+		, buffer(DEFAULT_BUFFER_SIZE)
+		, bufferSize(DEFAULT_BUFFER_SIZE)
+		, dispatcher()
+		, locationInfo(false)
+		, blocking(true)
 		, eventCount(0)
 		, dispatchedCount(0)
 		, commitCount(0)
+		{ }
+
+	~AsyncAppenderPriv()
 	{
+		stopDispatcher();
 	}
 
 	/**
@@ -191,10 +192,6 @@ struct AsyncAppender::AsyncAppenderPriv : public AppenderSkeleton::AppenderSkele
 	*/
 	bool blocking;
 
-#if LOG4CXX_EVENTS_AT_EXIT
-	helpers::AtExitRegistry::Raii atExitRegistryRaii;
-#endif
-
 	/**
 	 * Used to calculate the buffer position at which to store the next event.
 	*/

src/test/cpp/asyncappendertestcase.cpp

@@ -310,7 +310,6 @@ class AsyncAppenderTestCase : public AppenderSkeletonTestCase
 			LOG4CXX_INFO(root, "Message");
 			auto& v = vectorAppender->getVector();
 			LOGUNIT_ASSERT(0 < v.size());
-			asyncAppender->close(); // Wait for dispatch thread to complete
 		}
 
 		/**