log4cplus
diff --git a/‎CMakeLists.txt
Lines changed: 1 addition & 0 deletions b/‎CMakeLists.txt
Lines changed: 1 addition & 0 deletions
diff --git a/‎src/CMakeLists.txt
Lin 8000 es changed: 5 additions & 0 deletions b/‎src/CMakeLists.txt
Lin 8000 es changed: 5 additions & 0 deletions
diff --git a/‎src/global-init.cxx
Lines changed: 23 additions & 3 deletions b/‎src/global-init.cxx
Lines changed: 23 additions & 3 deletions
@@ -39,6 +39,7 @@ set (log4cplus_postfix "")
 
 option(LOG4CPLUS_BUILD_TESTING "Build the test suite." ON)
 option(LOG4CPLUS_BUILD_LOGGINGSERVER "Build the logging server." ON)
+option(LOG4CPLUS_REQUIRE_EXPLICIT_INITIALIZATION "Require explicit initialization (see log4cplus::Initializer)" OFF)
 
 if(NOT LOG4CPLUS_SINGLE_THREADED)
   find_package (Threads)
 
@@ -49,6 +49,11 @@ set (log4cplus_sources
   tls.cxx
   version.cxx)
 
+if (LOG4CPLUS_REQUIRE_EXPLICIT_INITIALIZATION)
+  set_property(SOURCE global-init.cxx 
+    APPEND PROPERTY COMPILE_DEFINITIONS LOG4CPLUS_REQUIRE_EXPLICIT_INITIALIZATION)
+endif(LOG4CPLUS_REQUIRE_EXPLICIT_INITIALIZATION)
+
 #message (STATUS "Type: ${UNIX}|${CYGWIN}|${WIN32}")
 
 if ("${UNIX}" OR "${CYGWIN}")
 
@@ -215,10 +215,28 @@ alloc_dc ()
 
 static
 DefaultContext *
-get_dc (bool alloc = 
8000
true)
+get_dc(
+#ifdef LOG4CPLUS_REQUIRE_EXPLICIT_INITIALIZATION
+  bool alloc = false
+#else
+  bool alloc = true
+#endif
+)
 {
-    if (LOG4CPLUS_UNLIKELY (! default_context && alloc))
-        alloc_dc ();
+    if (LOG4CPLUS_UNLIKELY(!default_context))
+    {
+        if (alloc)
+        {
+            alloc_dc();
+        }
+        else
+        {
+#ifdef LOG4CPLUS_REQUIRE_EXPLICIT_INITIALIZATION
+            tcerr << LOG4CPLUS_TEXT("ERROR: log4cplus is not initialized (see log4cplus::Initializer)") << std::endl;
+            throw std::logic_error("log4cplus is not initialized");
+#endif
+        }
+    }
     return default_context;
 }
 
@@ -630,11 +648,13 @@ thread_callback (LPVOID /*hinstDLL*/, DWORD fdwReason, LPVOID /*lpReserved*/)
     {
     case DLL_PROCESS_ATTACH:
     {
+#if !defined(LOG4CPLUS_REQUIRE_EXPLICIT_INITIALIZATION)
         // We cannot initialize log4cplus directly here. This is because
         // DllMain() is called under loader lock. When we are using C++11
         // threads and synchronization primitives then there is a deadlock
         // somewhere in internals of std::mutex::lock().
         queueLog4cplusInitializationThroughAPC ();
+#endif
         break;
     }