Add sys property to control how to cleanup context's ThreadLocal (Fixes

smallrye#424)
franz1981 · Jun 20, 2023 · e2effb3 · e2effb3
1 parent 724779a
commit e2effb3
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/core/src/main/java/io/smallrye/context/SmallRyeThreadContext.java b/core/src/main/java/io/smallrye/context/SmallRyeThreadContext.java
@@ -64,13 +64,19 @@
 
 public class SmallRyeThreadContext implements ThreadContext {
 
+    private static final String CLOSE_SETTING_NULL_PROP_NAME = "io.smallrye.context.storage.CLOSE_SETTING_NULL";
+    private static final boolean CLOSE_SETTING_NULL = Boolean.getBoolean(CLOSE_SETTING_NULL_PROP_NAME);
     final static ThreadLocal<SmallRyeThreadContext> currentThreadContext = StorageManager
             .threadLocal(SmallRyeThreadContextStorageDeclaration.class);
 
     private final static CleanAutoCloseable NULL_THREAD_STATE = new CleanAutoCloseable() {
         @Override
         public void close() {
-            currentThreadContext.remove();
+            if (!CLOSE_SETTING_NULL) {
+                currentThreadContext.remove();
+            } else {
+                currentThreadContext.set(null);
+            }
         }
     };
 
@@ -118,7 +124,7 @@ public static void withThreadContext(SmallRyeThreadContext threadContext, Runnab
         try {
             f.run();
         } finally {
-            if (oldValue == null) {
+            if (!CLOSE_SETTING_NULL && oldValue == null)
                 currentThreadContext.remove();
             } else {
                 currentThreadContext.set(oldValue);
@@ -141,7 +147,7 @@ public static <T> T withThreadContext(SmallRyeThreadContext threadContext, Suppl
         try {
             return f.get();
         } finally {
-            if (oldValue == null) {
+            if (!CLOSE_SETTING_NULL && oldValue == null) {
                 currentThreadContext.remove();
             } else {
                 currentThreadContext.set(oldValue);