MDC and NDC availablity no longer depend on APR thread support (#299)

apache · Nov 22, 2023 · 0f20ec7 · 0f20ec7
1 parent 587f493
commit 0f20ec7
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/main/cpp/threadspecificdata.cpp b/src/main/cpp/threadspecificdata.cpp
@@ -64,6 +64,9 @@ ThreadSpecificData* ThreadSpecificData::getCurrentData()
 	void* pData = NULL;
 	apr_threadkey_private_get(&pData, APRInitializer::getTlsKey());
 	return (ThreadSpecificData*) pData;
+#elif LOG4CXX_HAS_THREAD_LOCAL
+	thread_local ThreadSpecificData data;
+	return &data;
 #else
 	return &getDataNoThreads();
 #endif
@@ -167,6 +170,8 @@ ThreadSpecificData* ThreadSpecificData::createCurrentData()
 	}
 
 	return newData;
+#elif LOG4CXX_HAS_THREAD_LOCAL
+	return getCurrentData();
 #else
 	return 0;
 #endif