[jboss-cvs] JBoss Messaging SVN: r5958 - trunk/tests/src/org/jboss/messaging/tests/integration/xa.

[jboss-cvs-commits at lists.jboss.org]

Author: ataylor
Date: 2009-03-02 08:45:31 -0500 (Mon, 02 Mar 2009)
New Revision: 5958

Modified:
   trunk/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaTest.java
Log:
test fix

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaTest.java	2009-03-02 13:42:16 UTC (rev 5957)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaTest.java	2009-03-02 13:45:31 UTC (rev 5958)
@@ -245,15 +245,18 @@
 
       final ClientSession session;
 
-      private Xid xid;
-
       private CountDownLatch latch;
 
       public TxMessageHandler(ClientSession session, CountDownLatch latch)
       {
          this.latch = latch;
          this.session = session;
-         xid = new XidImpl( UUIDGenerator.getInstance().generateStringUUID().getBytes(), 1, UUIDGenerator.getInstance().generateStringUUID().getBytes());
+      }
+
+      public void onMessage(final ClientMessage message)
+      {
+         JBossMessage jbm = JBossMessage.createMessage(message, session);
+         Xid xid = new XidImpl( UUIDGenerator.getInstance().generateStringUUID().getBytes(), 1, UUIDGenerator.getInstance().generateStringUUID().getBytes());
          try
          {
             session.start(xid, XAResource.TMNOFLAGS);
@@ -262,12 +265,6 @@
          {
             e.printStackTrace();
          }
-      }
-
-      public void onMessage(final ClientMessage message)
-      {
-         JBossMessage jbm = JBossMessage.createMessage(message, session);
-
          try
          {
             jbm.doBeforeReceive();
@@ -293,9 +290,7 @@
             session.end(xid, XAResource.TMSUCCESS);
             //session.stop();
             session.rollback(xid);
-           // session.start();
-            xid = new XidImpl( UUIDGenerator.getInstance().generateStringUUID().getBytes(), 1, UUIDGenerator.getInstance().generateStringUUID().getBytes());
-            session.start(xid, XAResource.TMNOFLAGS);
+            //session.start();
          }
          catch (Exception e)
          {