bzr push into clusterj branch (Craig.Russell:303 to 304)

[Craig L Russell]

  304 Craig L Russell	2010-09-01
      Add error message with Exception

    modified:
      clusterj-test/src/main/java/testsuite/clusterj/AbstractClusterJTest.java
  303 Craig L Russell	2010-09-01
      Disable Coordinated transaction tests

    modified:
      clusterj-test/src/main/java/testsuite/clusterj/CoordinatedTransactionIdVariableTest.java
      clusterj-tie/src/test/java/testsuite/clusterj/tie/CoordinatedTransactionIdVariableTest.java
=== modified file 'clusterj-test/src/main/java/testsuite/clusterj/AbstractClusterJTest.java'
--- a/clusterj-test/src/main/java/testsuite/clusterj/AbstractClusterJTest.java	2010-07-28 05:30:48 +0000
+++ b/clusterj-test/src/main/java/testsuite/clusterj/AbstractClusterJTest.java	2010-09-01 22:05:41 +0000
@@ -128,7 +128,7 @@ public abstract class AbstractClusterJTe
         return props;
     }
 
-    protected void createSession() {
+    public void createSession() {
         if (session != null && !session.isClosed()) {
             tx = session.currentTransaction();
             if (tx.isActive()) {
@@ -160,6 +160,14 @@ public abstract class AbstractClusterJTe
         errorMessages.append(message + NL);
     }
 
+    protected void error(String context, Exception ex) {
+        String message = context + " " + ex.getClass().getName() + ":" + ex.getMessage();
+        error(message);
+        if (getDebug()) {
+            ex.printStackTrace();
+        }
+    }
+
     protected void errorIfNotEqual(String message, Object expected, Object actual) {
         if (expected == null && actual == null) {
             return;
@@ -206,7 +214,7 @@ public abstract class AbstractClusterJTe
         } catch (SQLException e) {
             throw new RuntimeException("Caught SQLException during close.", e);
         } finally {
-        connection = null;
+            connection = null;
         }
     }
 


Attachment: [text/bzr-bundle] bzr/[e-mail]