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

[andrae at mulgara.org]

Author: andrae
Date: 2007-11-21 05:14:39 -0600 (Wed, 21 Nov 2007)
New Revision: 571

Modified:
   branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/DatabaseSession.java
Log:
Minor compile-error fixes.



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-21 11:13:47 UTC (rev 570)
+++ branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/DatabaseSession.java	2007-11-21 11:14:39 UTC (rev 571)
@@ -39,8 +39,7 @@
 import java.util.*;
 
 // Java 2 enterprise packages
-import javax.transaction.RollbackException;
-import javax.transaction.Status;
+import javax.transaction.xa.XAResource;
 
 // Third party packages
 import org.apache.log4j.Logger;
@@ -661,7 +660,7 @@
 
   private void assertInternallyManagedXA() throws QueryException {
     if (transactionFactory == null) {
-      internalFactory = transactionFactory = transactionManager.getInternalFactory();
+      transactionFactory = internalFactory = transactionManager.getInternalFactory();
     } else if (internalFactory == null) {
       throw new QueryException("Attempt to use internal transaction control in externally managed session");
     }
@@ -669,7 +668,7 @@
 
   private void assertExternallyManagedXA() throws QueryException {
     if (transactionFactory == null) {
-      externalFactory = transactionFactory = transactionManager.getExternalFactory();
+      transactionFactory = externalFactory = transactionManager.getExternalFactory();
     } else if (externalFactory == null) {
       throw new QueryException("Attempt to use external transaction control in internally managed session");
     }
@@ -677,6 +676,6 @@
 
   public XAResource getXAResource() throws QueryException {
     assertExternallyManagedXA();
-    return externalFactory.getXAResource();
+    return externalFactory.getXAResource(this);
   }
 }