[Mulgara-svn] r552 - branches/nw-interface/src/jar/query/java/org/mulgara/query/operation

[pag at mulgara.org]

Author: pag
Date: 2007-11-15 00:36:41 -0600 (Thu, 15 Nov 2007)
New Revision: 552

Modified:
   branches/nw-interface/src/jar/query/java/org/mulgara/query/operation/Rollback.java
Log:
Now pulling connection out of a transaction when rolling back the contained session - since rollbacks force the transaction to end

Modified: branches/nw-interface/src/jar/query/java/org/mulgara/query/operation/Rollback.java
===================================================================
--- branches/nw-interface/src/jar/query/java/org/mulgara/query/operation/Rollback.java	2007-11-15 06:34:10 UTC (rev 551)
+++ branches/nw-interface/src/jar/query/java/org/mulgara/query/operation/Rollback.java	2007-11-15 06:36:41 UTC (rev 552)
@@ -45,7 +45,8 @@
     Session session = conn.getSession();
     if (session != null) {
       session.rollback();
-      return setResultMessage("Successfully rolled back transaction");
+      conn.setAutoCommit(true);  // this is called because stayInTx returns false
+      return setResultMessage("Successfully rolled back changes");
     } else {
       assert conn instanceof org.mulgara.connection.DummyConnection;
       return setResultMessage("Skipped rollback for internal connection");