Fix ThreadContextMap selection algorithm

ppkarwasz · ppkarwasz · commit 51d0fb371635 · 2024-04-25T20:38:12.000+02:00
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/Provider.java
@@ -326,10 +326,10 @@ public String getThreadContextMap() {
             return threadContextMapClass;
         }
         // Default based on properties
-        if (props.getBooleanProperty(GC_FREE_THREAD_CONTEXT_PROPERTY, !Constants.IS_WEB_APP)) {
+        if (props.getBooleanProperty(GC_FREE_THREAD_CONTEXT_PROPERTY)) {
             return GARBAGE_FREE_CONTEXT_MAP;
         }
-        return Constants.IS_WEB_APP ? WEB_APP_CONTEXT_MAP : COPY_ON_WRITE_CONTEXT_MAP;
+        return Constants.ENABLE_THREADLOCALS ? COPY_ON_WRITE_CONTEXT_MAP : WEB_APP_CONTEXT_MAP;
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -326,10 +326,10 @@ public String getThreadContextMap() {`
`326`	`326`	`return threadContextMapClass;`
`327`	`327`	`}`
`328`	`328`	`// Default based on properties`
`329`		`- if (props.getBooleanProperty(GC_FREE_THREAD_CONTEXT_PROPERTY, !Constants.IS_WEB_APP)) {`
	`329`	`+ if (props.getBooleanProperty(GC_FREE_THREAD_CONTEXT_PROPERTY)) {`
`330`	`330`	`return GARBAGE_FREE_CONTEXT_MAP;`
`331`	`331`	`}`
`332`		`- return Constants.IS_WEB_APP ? WEB_APP_CONTEXT_MAP : COPY_ON_WRITE_CONTEXT_MAP;`
	`332`	`+ return Constants.ENABLE_THREADLOCALS ? COPY_ON_WRITE_CONTEXT_MAP : WEB_APP_CONTEXT_MAP;`
`333`	`333`	`}`
`334`	`334`
`335`	`335`	`/**`