Propagate JNDI context if none exists

Passes Concurrency TCK in appserver/tests/tck/concurrency. Passes tests in appserver/tests/admin and application. Signed-off-by:Ondro Mihalyi <mihalyi@omnifish.ee>
eclipse-ee4j · Aug 14, 2023 · fdcd7ca · fdcd7ca
1 parent f1665c1
commit fdcd7ca
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/...current-impl/src/main/java/org/glassfish/concurrent/runtime/ContextSetupProviderImpl.java b/...current-impl/src/main/java/org/glassfish/concurrent/runtime/ContextSetupProviderImpl.java
@@ -149,11 +149,18 @@ public ContextHandle setup(ContextHandle contextHandle) {
             resetSecurityContext = SecurityContext.getCurrent();
             SecurityContext.setCurrent(invocationCtx.getSecurityContext());
         }
-        if (invocation != null) {
-            // Each invocation needs a ResourceTableKey that returns a unique hashCode for TransactionManager
-            invocation.setResourceTableKey(new PairKey(invocation.getInstance(), Thread.currentThread()));
-            invocationManager.preInvoke(invocation);
+
+        if (setup.isUnchanged(JNDI) || (!setup.isPropagated(JNDI) && !setup.isClear(JNDI))) {
+            ComponentInvocation currentInvocation = invocationManager.getCurrentInvocation();
+            if (currentInvocation != null) {
+                invocation = currentInvocation;
+            }
         }
+
+        // Each invocation needs a ResourceTableKey that returns a unique hashCode for TransactionManager
+        invocation.setResourceTableKey(new PairKey(invocation.getInstance(), Thread.currentThread()));
+        invocationManager.preInvoke(invocation);
+
         // Ensure that there is no existing transaction in the current thread
         if (transactionManager != null && setup.isClear(StandardContextType.WorkArea)) {
             transactionManager.clearThreadTx();
@@ -237,10 +244,7 @@ private ComponentInvocation getSavedInvocation() {
         if (setup.isClear(JNDI)) {
             return new ComponentInvocation();
         }
-        if (setup.isPropagated(JNDI)) {
-            return cloneComponentInvocation(currentInvocation);
-        }
-        return null;
+        return cloneComponentInvocation(currentInvocation);
     }
 
 

diff --git a/appserver/tests/tck/concurrency/pom.xml b/appserver/tests/tck/concurrency/pom.xml
@@ -53,7 +53,7 @@
             <dependency>
                 <groupId>org.jboss.arquillian</groupId>
                 <artifactId>arquillian-bom</artifactId>
-                <version>1.7.0.Alpha13</version>
+                <version>1.7.0.Final</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>