[Mulgara-svn] r539 - branches/nw-interface/src/jar/itql/java/org/mulgara/itql

[pag at mulgara.org]

Author: pag
Date: 2007-11-14 07:39:24 -0600 (Wed, 14 Nov 2007)
New Revision: 539

Modified:
   branches/nw-interface/src/jar/itql/java/org/mulgara/itql/TqlAutoInterpreter.java
Log:
Missed a condition during an assertion, meaning there were some assert errors when closing a transaction

Modified: branches/nw-interface/src/jar/itql/java/org/mulgara/itql/TqlAutoInterpreter.java
===================================================================
--- branches/nw-interface/src/jar/itql/java/org/mulgara/itql/TqlAutoInterpreter.java	2007-11-14 08:39:26 UTC (rev 538)
+++ branches/nw-interface/src/jar/itql/java/org/mulgara/itql/TqlAutoInterpreter.java	2007-11-14 13:39:24 UTC (rev 539)
@@ -339,7 +339,7 @@
       // check that transaction changes came from setAutoCommit commands
       assert inTransaction != conn.getAutoCommit() || cmd instanceof org.mulgara.query.operation.SetAutoCommit: "Got a state change on " + cmd.getClass() + " instead of SetAutoCommit";
       // check that if we are starting a transaction then the transConnections list is empty
-      assert conn.getAutoCommit() || transConnections.isEmpty();
+      assert inTransaction != conn.getAutoCommit() || conn.getAutoCommit() || transConnections.isEmpty();
       // save the number of active connections
       int activeConnections = transConnections.size();
       // handle the transaction operation