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

[pag at mulgara.org]

Author: pag
Date: 2007-11-14 12:18:59 -0600 (Wed, 14 Nov 2007)
New Revision: 542

Modified:
   branches/nw-interface/src/jar/query/java/org/mulgara/query/operation/Rollback.java
Log:
Checking for null session on rollback. This should have been done when the Commit command was updated to do the same

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-14 15:39:26 UTC (rev 541)
+++ branches/nw-interface/src/jar/query/java/org/mulgara/query/operation/Rollback.java	2007-11-14 18:18:59 UTC (rev 542)
@@ -17,6 +17,7 @@
 
 import org.mulgara.connection.Connection;
 import org.mulgara.query.QueryException;
+import org.mulgara.server.Session;
 
 
 /**
@@ -41,8 +42,14 @@
    * @throws QueryException There was a server error commiting the transaction.
    */
   public Object execute(Connection conn) throws QueryException {
-    conn.getSession().rollback();
-    return setResultMessage("Successfully rolled back transaction");
+    Session session = conn.getSession();
+    if (session != null) {
+      session.rollback();
+      return setResultMessage("Successfully rolled back transaction");
+    } else {
+      assert conn instanceof org.mulgara.connection.DummyConnection;
+      return setResultMessage("Skipped rollback for internal connection");
+    }
   }