[Mulgara-svn] r565 - branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver

[andrae at mulgara.org]

Author: andrae
Date: 2007-11-16 00:20:02 -0600 (Fri, 16 Nov 2007)
New Revision: 565

Modified:
   branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/DatabaseSession.java
   branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraInternalTransaction.java
   branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraXAResource.java
Log:
Just some simple renames and code cleanups.



Modified: branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/DatabaseSession.java
===================================================================
--- branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/DatabaseSession.java	2007-11-16 06:19:08 UTC (rev 564)
+++ branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/DatabaseSession.java	2007-11-16 06:20:02 UTC (rev 565)
@@ -562,7 +562,7 @@
   public void close() throws QueryException {
     logger.info("Closing session");
     try {
-      transactionFactory.rollbackCurrentTransactions(this);
+      transactionFactory.closingSession(this);
     } catch (MulgaraTransactionException em) {
       throw new QueryException("Error closing session. Forced close required", em);
     }

Modified: branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraInternalTransaction.java
===================================================================
--- branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraInternalTransaction.java	2007-11-16 06:19:08 UTC (rev 564)
+++ branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraInternalTransaction.java	2007-11-16 06:20:02 UTC (rev 565)
@@ -79,7 +79,7 @@
   private static final Logger logger =
     Logger.getLogger(MulgaraInternalTransaction.class.getName());
 
-  private MulgaraTransactionManager manager;
+  private MulgaraInternalTransactionFactory factory;
   private DatabaseOperationContext context;
   private Set<EnlistableResource> enlisted;
 
@@ -94,17 +94,17 @@
 
   private Throwable rollbackCause;
 
-  public MulgaraInternalTransaction(MulgaraTransactionManager manager, DatabaseOperationContext context)
+  public MulgaraInternalTransaction(MulgaraInternalTransactionFactory factory, DatabaseOperationContext context)
       throws IllegalArgumentException {
     report("Creating Transaction");
 
     try {
-      if (manager == null) {
+      if (factory == null) {
         throw new IllegalArgumentException("Manager null in MulgaraTransaction");
       } else if (context == null) {
         throw new IllegalArgumentException("OperationContext null in MulgaraTransaction");
       }
-      this.manager = manager;
+      this.factory = factory;
       this.context = context;
       this.enlisted = new HashSet<EnlistableResource>();
       this.activationMutex = new ReentrantLock();
@@ -331,7 +331,7 @@
   private void startTransaction() throws MulgaraTransactionException {
     report("Initiating transaction");
     try {
-      transaction = manager.transactionStart(this);
+      transaction = factory.transactionStart(this);
       synchronized (this) {
         currentThread = Thread.currentThread();
       }
@@ -343,7 +343,7 @@
   private void resumeTransaction() throws MulgaraTransactionException {
 //    report("Resuming transaction");
     try {
-      manager.transactionResumed(this, transaction);
+      factory.transactionResumed(this, transaction);
       synchronized (this) {
         currentThread = Thread.currentThread();
       }
@@ -359,7 +359,7 @@
         throw implicitRollback(
             new MulgaraTransactionException("Attempt to suspend unreferenced transaction"));
       }
-      transaction = manager.transactionSuspended(this);
+      transaction = factory.transactionSuspended(this);
       synchronized (this) {
         currentThread = null;
       }
@@ -388,9 +388,9 @@
       } finally { try {
         enlisted.clear();
       } finally { try {
-        manager.transactionComplete(this);
+        factory.transactionComplete(this);
       } finally { try {
-        manager = null;
+        factory = null;
       } finally {
         report("Committed transaction");
       } } } } } }
@@ -421,7 +421,7 @@
           transaction.rollback();
           context.clear();
           enlisted.clear();
-          manager.transactionComplete(this);
+          factory.transactionComplete(this);
           state = State.FINISHED;
           break;
         case DEACTREF:
@@ -479,8 +479,8 @@
             context.clear();
             enlisted.clear();
             state = State.FAILED;
-            manager.transactionComplete(this);
-            manager = null;
+            factory.transactionComplete(this);
+            factory = null;
             return new MulgaraTransactionException("Transaction rollback triggered", cause);
         case DEACTREF:
           throw new IllegalStateException("Attempt to rollback deactivated transaction");
@@ -517,7 +517,7 @@
    */
   MulgaraTransactionException abortTransaction(String errorMessage, Throwable cause)
       throws MulgaraTransactionException {
-    // We need to notify the manager here - this is serious, we
+    // We need to notify the factory here - this is serious, we
     // need to rollback this transaction, but if we have reached here
     // we have failed to obtain a valid transaction to rollback!
     try {
@@ -528,7 +528,7 @@
           transaction.rollback();
         }
       } finally { try {
-        manager.transactionAborted(this);
+        factory.transactionAborted(this);
       } finally { try {
         abortEnlistedResources();
       } finally { try {
@@ -538,7 +538,7 @@
       } finally { try {
         transaction = null;
       } finally { try {
-        manager = null;
+        factory = null;
       } finally {
         state = State.FAILED;
       } } } } } } } }
@@ -714,7 +714,7 @@
       errorReport("Reference counting error in transaction", null);
     }
 
-    if (manager != null || transaction != null) {
+    if (factory != null || transaction != null) {
       errorReport("Transaction not terminated properly", null);
     }
   }

Modified: branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraXAResource.java
===================================================================
--- branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraXAResource.java	2007-11-16 06:19:08 UTC (rev 564)
+++ branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/MulgaraXAResource.java	2007-11-16 06:20:02 UTC (rev 565)
@@ -148,9 +148,11 @@
   }
 
   public int getTransactionTimeout() {
+    FIXME!
   }
 
   public boolean isSameRM(XAResource xares) {
+    FIXME!
   }
 
 
@@ -196,7 +198,7 @@
         } else if (existing transaction(session)) {
           throw new XAException(XAException.XA_RBDEADLOCK);
         } else {
-          MulgaraTransaction xa = factory.newTransaction(session, isWrite);
+          MulgaraTransaction xa = factory.createTransaction(session, isWrite);
           xa2xid.put(xa, xid);
         }
         break;
@@ -222,4 +224,11 @@
         break;
     }
   }
+
+  /**
+   * Called on session close to clean-up any remaining transactions.
+   */
+  public void close() {
+    FIXME!
+  }
 }