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

[ronald at mulgara.org]

Author: ronald
Date: 2008-06-10 22:05:21 -0700 (Tue, 10 Jun 2008)
New Revision: 994

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/MulgaraTransactionManager.java
Log:
Set the transaction-timeout on the internal transaction-manager for local
transactions too. This functionality was inadvertently removed in r977,
resulting in local transactions always being rolled back if they exceeded
jotm's default timeout of 60s.


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-06-11 04:58:53 UTC (rev 993)
+++ branches/mgr-121-lockrecovery/src/jar/resolver/java/org/mulgara/resolver/MulgaraInternalTransactionFactory.java	2008-06-11 05:05:21 UTC (rev 994)
@@ -292,6 +292,7 @@
           throw new MulgaraTransactionException("Attempt to start transaction twice");
         }
 
+        setTransactionTimeout((int) (sessionXAMap.get1(transaction).getTransactionTimeout() / 1000));
         transactionManager.begin();
         Transaction jtaTrans = transactionManager.getTransaction();
 
@@ -402,7 +403,7 @@
     }
   }
 
-  public void setTransactionTimeout(int transactionTimeout) {
+  private void setTransactionTimeout(int transactionTimeout) {
     try {
       transactionManager.setTransactionTimeout(transactionTimeout);
     } catch (SystemException es) {

Modified: branches/mgr-121-lockrecovery/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionManager.java
===================================================================
--- branches/mgr-121-lockrecovery/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionManager.java	2008-06-11 04:58:53 UTC (rev 993)
+++ branches/mgr-121-lockrecovery/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionManager.java	2008-06-11 05:05:21 UTC (rev 994)
@@ -172,11 +172,6 @@
   }
 
 
-  public void setTransactionTimeout(int transactionTimeout) {
-    internalFactory.setTransactionTimeout(transactionTimeout);
-  }
-
-
   /**
    * Used to replace the built in monitor to allow it to be properly released
    * during potentially blocking operations.  All potentially blocking