Do not allocate DefaultContext in shutdownThreadPool().

wilx · wilx · commit 56974afb1734 · 2019-04-09T20:14:23.000+02:00
This fixes #278 or its part.
diff --git a/src/global-init.cxx b/src/global-init.cxx
@@ -309,7 +309,13 @@ enqueueAsyncDoAppend (SharedAppenderPtr const & appender,
 void
 shutdownThreadPool ()
 {
-    LOG4CPLUS_THREADED (get_dc ()->thread_pool.reset ());
+#if ! defined (LOG4CPLUS_SINGLE_THREADED)
+    DefaultContext * const dc = get_dc (false);
+    if (dc && dc->thread_pool)
+    {
+        dc->thread_pool.reset ();
+    }
+#endif
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -309,7 +309,13 @@ enqueueAsyncDoAppend (SharedAppenderPtr const & appender,`
`309`	`309`	`void`
`310`	`310`	`shutdownThreadPool ()`
`311`	`311`	`{`
`312`		`- LOG4CPLUS_THREADED (get_dc ()->thread_pool.reset ());`
	`312`	`+#if ! defined (LOG4CPLUS_SINGLE_THREADED)`
	`313`	`+ DefaultContext * const dc = get_dc (false);`
	`314`	`+ if (dc && dc->thread_pool)`
	`315`	`+ {`
	`316`	`+ dc->thread_pool.reset ();`
	`317`	`+ }`
	`318`	`+#endif`
`313`	`319`	`}`
`314`	`320`
`315`	`321`