Merge pull request #299 from FroMage/bean-removal-fix

Make sure we handle the case where JTA can work even with Arc not having its bean present
smallrye · Jul 26, 2021 · 29202d4 · 29202d4
2 parents d58ab0d + 42672e8
commit 29202d4
Showing 1 changed file with 19 additions and 10 deletions.
diff --git a/jta/src/main/java/io/smallrye/context/jta/context/propagation/JtaContextProvider.java b/jta/src/main/java/io/smallrye/context/jta/context/propagation/JtaContextProvider.java
@@ -117,17 +117,26 @@ private TransactionManager tm() {
         if (lifecycleManagers.isResolvable()) {
             lifecycleManagers.get().setProvider(this);
         }
-        tm = CDI.current().select(TransactionManager.class).get();
-        if (tm != null) {
-            // validate it, because it can be an empty proxy
-            try {
-                tm.getStatus();
-            } catch (CreationException | SystemException x) {
-                x.printStackTrace();
-                // not really there
-                transactionManagerNotAvailable = true;
-                return null;
+        // make sure we handle the case of SR-CP-JTA being imported while Narayana is excluded somehow
+        Instance<TransactionManager> tmInstance = CDI.current().select(TransactionManager.class);
+        if (tmInstance.isResolvable()) {
+            tm = tmInstance.get();
+            // so in theory we can't get null here, but better safe than sorry
+            if (tm != null) {
+                // validate it, because it can be an empty proxy
+                // Here Matej says it can't be an empty proxy, but even though I don't have tests
+                // for this, this looks too specific to have come up by accident.
+                try {
+                    tm.getStatus();
+                } catch (CreationException | SystemException x) {
+                    // not really there
+                    transactionManagerNotAvailable = true;
+                    return null;
+                }
             }
+        } else {
+            transactionManagerNotAvailable = true;
+            return null;
         }
         // save it for later
         return this.transactionManager = tm;