Merge pull request #3118 from ebean-orm/feature/3109-JtaTransaction-c…

…urrentTransaction

#3109 JtaTransactionManager - fix getCurrentTransaction()

ebean-core/src/main/java/io/ebeaninternal/server/transaction/JtaTransactionManager.java

@@ -52,7 +52,7 @@ private DataSource dataSource() {
     return transactionManager.dataSource();
   }
 
-  private TransactionSynchronizationRegistry getSyncRegistry() {
+  private TransactionSynchronizationRegistry registry() {
     try {
       InitialContext ctx = new InitialContext();
       return (TransactionSynchronizationRegistry) ctx.lookup("java:comp/TransactionSynchronizationRegistry");
@@ -61,7 +61,7 @@ private TransactionSynchronizationRegistry getSyncRegistry() {
     }
   }
 
-  private UserTransaction getUserTransaction() {
+  private UserTransaction userTransaction() {
     try {
       InitialContext ctx = new InitialContext();
       return (UserTransaction) ctx.lookup("java:comp/UserTransaction");
@@ -78,11 +78,16 @@ private UserTransaction getUserTransaction() {
    */
   @Override
   public Object getCurrentTransaction() {
-    TransactionSynchronizationRegistry syncRegistry = getSyncRegistry();
-    SpiTransaction t = (SpiTransaction) syncRegistry.getResource(EBEAN_TXN_RESOURCE);
-    if (t != null) {
-      // we have already seen this transaction
-      return t;
+    TransactionSynchronizationRegistry syncRegistry = registry();
+    try {
+      SpiTransaction t = (SpiTransaction) syncRegistry.getResource(EBEAN_TXN_RESOURCE);
+      if (t != null) {
+        // we have already seen this transaction
+        return t;
+      }
+    } catch (Exception e) {
+      // deem that there is no current transaction
+      return null;
     }
 
     // check current Ebean transaction
@@ -93,7 +98,7 @@ public Object getCurrentTransaction() {
       return currentEbeanTransaction;
     }
 
-    UserTransaction ut = getUserTransaction();
+    UserTransaction ut = userTransaction();
     if (ut == null) {
       // no current JTA transaction
       if (log.isLoggable(DEBUG)) {