Revert "Force cleanup of ThreadLocal (#501)" (#579)

This reverts commit c3b7703.
arquillian · Jul 2, 2024 · 995940e · 995940e
1 parent 36c0a77
commit 995940e
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 76 deletions.
diff --git a/core/impl-base/src/main/java/org/jboss/arquillian/core/impl/ManagerImpl.java b/core/impl-base/src/main/java/org/jboss/arquillian/core/impl/ManagerImpl.java
@@ -39,7 +39,6 @@
 import org.jboss.arquillian.core.spi.Manager;
 import org.jboss.arquillian.core.spi.NonManagedObserver;
 import org.jboss.arquillian.core.spi.ObserverMethod;
-import org.jboss.arquillian.core.spi.ThreadLocalUtil;
 import org.jboss.arquillian.core.spi.Validate;
 import org.jboss.arquillian.core.spi.context.ApplicationContext;
 import org.jboss.arquillian.core.spi.context.Context;
@@ -280,9 +279,6 @@ public void shutdown() {
             runtimeLogger.clear();
 
             handledThrowables.remove();
-
-            //Force cleanup ThreadLocal:
-            ThreadLocalUtil.forceCleanupThreadLocal(handledThrowables);
         }
         if (shutdownException != null) {
             UncheckedThrow.throwUnchecked(shutdownException);

diff --git a/core/spi/src/main/java/org/jboss/arquillian/core/spi/ThreadLocalUtil.java b/core/spi/src/main/java/org/jboss/arquillian/core/spi/ThreadLocalUtil.java
diff --git a/core/spi/src/main/java/org/jboss/arquillian/core/spi/context/AbstractContext.java b/core/spi/src/main/java/org/jboss/arquillian/core/spi/context/AbstractContext.java
@@ -20,8 +20,6 @@
 import java.util.Stack;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.logging.Logger;
-
-import org.jboss.arquillian.core.spi.ThreadLocalUtil;
 import org.jboss.arquillian.core.spi.Validate;
 
 /**
@@ -107,15 +105,10 @@ public void clearAll() {
                 deactivateAll();
             }
             activeStore.remove();
-
-            //Force cleanup ThreadLocal:
-            ThreadLocalUtil.forceCleanupThreadLocal(activeStore);
-
             for (Map.Entry<T, ObjectStore> entry : stores.entrySet()) {
                 entry.getValue().clear();
             }
             stores.clear();
-
         }
     }