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

[andrae at mulgara.org]

Author: andrae
Date: 2007-11-22 03:34:18 -0600 (Thu, 22 Nov 2007)
New Revision: 576

Modified:
   branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/DatabaseSession.java
Log:
Implicit use of internal transactions doesn't work unless we ensure a
transaction factory has been selected.



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:21:21 UTC (rev 575)
+++ branches/mgr-73/src/jar/resolver/java/org/mulgara/resolver/DatabaseSession.java	2007-11-22 09:34:18 UTC (rev 576)
@@ -634,6 +634,7 @@
    */
   private void execute(Operation operation, String errorString) throws QueryException
   {
+    ensureTransactionFactorySelected();
     try {
       MulgaraTransaction transaction =
           transactionFactory.getTransaction(this, operation.isWriteOperation());
@@ -658,6 +659,12 @@
         writing);
   }
 
+  private void ensureTransactionFactorySelected() throws QueryException {
+    if (transactionFactory == null) {
+      assertInternallyManagedXA();
+    }
+  }
+
   private void assertInternallyManagedXA() throws QueryException {
     if (transactionFactory == null) {
       transactionFactory = internalFactory = transactionManager.getInternalFactory();