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

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

Author: ataylor
Date: 2009-03-02 08:42:16 -0500 (Mon, 02 Mar 2009)
New Revision: 5957

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:13:24 UTC (rev 5956)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/xa/BasicXaTest.java	2009-03-02 13:42:16 UTC (rev 5957)
@@ -207,7 +207,7 @@
 
    }
 
-/*   public void testReceiveRollback() throws Exception
+   /*public void testReceiveRollback() throws Exception
    {
       ClientSession clientSession2 = sessionFactory.createSession(false, true, true);
       ClientProducer clientProducer = clientSession2.createProducer(atestq);
@@ -223,7 +223,7 @@
       {
          clientSessions[i] = sessionFactory.createSession(true, false, false);
          clientConsumers[i] = clientSessions[i].createConsumer(atestq);
-         handlers[i] = new TxMessageHandler(clientSessions[i], i, latch);
+         handlers[i] = new TxMessageHandler(clientSessions[i], latch);
          clientConsumers[i].setMessageHandler(handlers[i]);
       }
       for (ClientSession session : clientSessions)
@@ -249,11 +249,11 @@
 
       private CountDownLatch latch;
 
-      public TxMessageHandler(ClientSession session, int id, CountDownLatch latch)
+      public TxMessageHandler(ClientSession session, CountDownLatch latch)
       {
          this.latch = latch;
          this.session = session;
-         xid = new XidImpl(("xa" + id).getBytes(), 1, UUIDGenerator.getInstance().generateStringUUID().getBytes());
+         xid = new XidImpl( UUIDGenerator.getInstance().generateStringUUID().getBytes(), 1, UUIDGenerator.getInstance().generateStringUUID().getBytes());
          try
          {
             session.start(xid, XAResource.TMNOFLAGS);
@@ -291,10 +291,13 @@
          try
          {
             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);
          }
-         catch (XAException e)
+         catch (Exception e)
          {
             e.printStackTrace();
             failedToAck = true;