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

[ronald at mulgara.org]

Author: ronald
Date: 2008-07-07 06:31:13 -0700 (Mon, 07 Jul 2008)
New Revision: 1068

Modified:
   branches/mgr-121-lockrecovery/src/jar/resolver/java/org/mulgara/resolver/MulgaraExternalTransactionFactory.java
   branches/mgr-121-lockrecovery/src/jar/resolver/java/org/mulgara/resolver/MulgaraInternalTransactionFactory.java
   branches/mgr-121-lockrecovery/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionFactory.java
Log:
One more cleanup: the 'writeTransaction' does not need to be protected by a
synchronized block anymore because as of r1065 the timeout tasks carry their
own references to the transaction.


Modified: branches/mgr-121-lockrecovery/src/jar/resolver/java/org/mulgara/resolver/MulgaraExternalTransactionFactory.java
===================================================================
--- branches/mgr-121-lockrecovery/src/jar/resolver/java/org/mulgara/resolver/MulgaraExternalTransactionFactory.java	2008-07-07 12:57:02 UTC (rev 1067)
+++ branches/mgr-121-lockrecovery/src/jar/resolver/java/org/mulgara/resolver/MulgaraExternalTransactionFactory.java	2008-07-07 13:31:13 UTC (rev 1068)
@@ -94,7 +94,7 @@
         MulgaraExternalTransaction xa = null;
         try {
           xa = new MulgaraExternalTransaction(this, xid, session.newOperationContext(true));
-          setWriteTransaction(xa);
+          writeTransaction = xa;
           associatedTransaction = xa;
           transactions.add(xa);
           transactionCreated(xa);
@@ -147,7 +147,7 @@
       }
       if (xa == writeTransaction) {
         manager.releaseWriteLock(session);
-        setWriteTransaction(null);
+        writeTransaction = null;
       }
       transactions.remove(xa);
       if (associatedTransaction == xa) {

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:57:02 UTC (rev 1067)
+++ branches/mgr-121-lockrecovery/src/jar/resolver/java/org/mulgara/resolver/MulgaraInternalTransactionFactory.java	2008-07-07 13:31:13 UTC (rev 1068)
@@ -99,8 +99,8 @@
           manager.obtainWriteLock(session);
           try {
             assert writeTransaction == null;
-            setWriteTransaction(transaction = 
-              new MulgaraInternalTransaction(this, session.newOperationContext(true)));
+            writeTransaction = transaction = 
+              new MulgaraInternalTransaction(this, session.newOperationContext(true));
           } catch (Throwable th) {
             manager.releaseWriteLock(session);
             throw new MulgaraTransactionException("Error creating write transaction", th);
@@ -367,7 +367,7 @@
       if (transaction == writeTransaction) {
         if (manager.isHoldingWriteLock(session)) {
           manager.releaseWriteLock(session);
-          setWriteTransaction(null);
+          writeTransaction = null;
         }
       }
 

Modified: branches/mgr-121-lockrecovery/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionFactory.java
===================================================================
--- branches/mgr-121-lockrecovery/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionFactory.java	2008-07-07 12:57:02 UTC (rev 1067)
+++ branches/mgr-121-lockrecovery/src/jar/resolver/java/org/mulgara/resolver/MulgaraTransactionFactory.java	2008-07-07 13:31:13 UTC (rev 1068)
@@ -88,12 +88,6 @@
     this.writeTransaction = null;
   }
 
-  protected void setWriteTransaction(MulgaraTransaction txn) {
-    synchronized (getMutexLock()) {
-      writeTransaction = txn;
-    }
-  }
-
   protected void transactionCreated(MulgaraTransaction transaction) {
     long idleTimeout = session.getIdleTimeout() > 0 ? session.getIdleTimeout() : 15*60*1000L;
     long txnTimeout = session.getTransactionTimeout() > 0 ? session.getTransactionTimeout() : 60*60*1000L;
@@ -159,7 +153,7 @@
                   error = th;
                 }
               } finally {
-                setWriteTransaction(null);
+                writeTransaction = null;
               }
             }
           } finally {