[Mulgara-svn] r1064 - branches/mgr-121-lockrecovery/src/jar/resolver/java/org/mulgara/resolver

[ronald at mulgara.org]

Author: ronald
Date: 2008-07-07 05:54:40 -0700 (Mon, 07 Jul 2008)
New Revision: 1064

Modified:
   branches/mgr-121-lockrecovery/src/jar/resolver/java/org/mulgara/resolver/MulgaraInternalTransactionFactory.java
Log:
Don't set the timeout on the underlying JTA transaction. Since we do our
own timing out of transactions, setting this is both unnecessary and actually
interferes with proper cleanup because our rollback could fail due to the
JTA transaction having already been rolled back.


Modified: branches/mgr-121-lockrecovery/src/jar/resolver/java/org/mulgara/resolver/MulgaraInternalTransactionFactory.java
===================================================================
--- branches/mgr-121-lockrecovery/src/jar/resolver/java/org/mulgara/resolver/MulgaraInternalTransactionFactory.java	2008-07-07 12:54:35 UTC (rev 1063)
+++ branches/mgr-121-lockrecovery/src/jar/resolver/java/org/mulgara/resolver/MulgaraInternalTransactionFactory.java	2008-07-07 12:54:40 UTC (rev 1064)
@@ -274,7 +274,6 @@
           throw new MulgaraTransactionException("Attempt to start transaction twice");
         }
 
-        setTransactionTimeout((int) (session.getTransactionTimeout() / 1000));
         transactionManager.begin();
         Transaction jtaTrans = transactionManager.getTransaction();
 
@@ -396,12 +395,4 @@
       releaseMutex();
     }
   }
-
-  private void setTransactionTimeout(int transactionTimeout) {
-    try {
-      transactionManager.setTransactionTimeout(transactionTimeout);
-    } catch (SystemException es) {
-      logger.warn("Unable to set transaction timeout: " + transactionTimeout, es);
-    }
-  }
 }