[jboss-cvs] JBoss Messaging SVN: r7971 - in branches/Branch_1_4: tests/src/org/jboss/test/messaging/jms and 1 other directory.

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

Author: gaohoward
Date: 2010-03-05 07:03:27 -0500 (Fri, 05 Mar 2010)
New Revision: 7971

Modified:
   branches/Branch_1_4/src/main/org/jboss/jms/tx/ResourceManager.java
   branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java
Log:
JBMESSAGING-1786


Modified: branches/Branch_1_4/src/main/org/jboss/jms/tx/ResourceManager.java
===================================================================
--- branches/Branch_1_4/src/main/org/jboss/jms/tx/ResourceManager.java	2010-03-05 10:17:56 UTC (rev 7970)
+++ branches/Branch_1_4/src/main/org/jboss/jms/tx/ResourceManager.java	2010-03-05 12:03:27 UTC (rev 7971)
@@ -589,7 +589,6 @@
    
                   transactions.put(txs[i], tx);
                }
-               tx.setRecovered(true);
             }
 
             return txs;

Modified: branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java
===================================================================
--- branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java	2010-03-05 10:17:56 UTC (rev 7970)
+++ branches/Branch_1_4/tests/src/org/jboss/test/messaging/jms/XARecoveryTest.java	2010-03-05 12:03:27 UTC (rev 7971)
@@ -661,11 +661,13 @@
          TextMessage tm7 = sess1.createTextMessage("tm7");
          TextMessage tm8 = sess1.createTextMessage("tm8");
          
+         //sends 4 messages to queue2
          prod1.send(tm1);
          prod1.send(tm2);
          prod1.send(tm3);         
          prod1.send(tm4);
-         
+
+         //sends 4 messages to queue3
          prod2.send(tm5);
          prod2.send(tm6);
          prod2.send(tm7);
@@ -681,6 +683,7 @@
          
          Xid xid1 = new MessagingXid("bq1".getBytes(), 42, "eemeli".getBytes());
          
+         //starting a tx
          res.start(xid1, XAResource.TMNOFLAGS);
          
          MessageProducer prod3 = sess2.createProducer(queue2);
@@ -690,6 +693,7 @@
          TextMessage tm11 = sess2.createTextMessage("tm11");
          TextMessage tm12 = sess2.createTextMessage("tm12");
          
+         //sends tm9 to tm12 to queue2 in tx
          prod3.send(tm9);
          prod3.send(tm10);
          prod3.send(tm11);
@@ -702,6 +706,7 @@
          TextMessage tm15 = sess2.createTextMessage("tm15");
          TextMessage tm16 = sess2.createTextMessage("tm16");
          
+         //sends tm13 to tm16 to queue3 in tx
          prod4.send(tm13);
          prod4.send(tm14);
          prod4.send(tm15);
@@ -709,6 +714,7 @@
          
          MessageConsumer cons1 = sess2.createConsumer(queue2);
          
+         //consumes 4 messages from queue2
          TextMessage rm1 = (TextMessage)cons1.receive(1000);
          assertNotNull(rm1);
          assertEquals(tm1.getText(), rm1.getText());
@@ -727,8 +733,10 @@
          
          Message m = cons1.receive(1000);
          
+         //no more as tm9-12 are in tx.
          assertNull(m);
-                  
+
+         //receive 4 messages from queue3
          MessageConsumer cons2 = sess2.createConsumer(queue3);
          
          TextMessage rm5 = (TextMessage)cons2.receive(1000);
@@ -748,13 +756,13 @@
          assertEquals(tm8.getText(), rm8.getText());
          
          m = cons2.receive(1000);
-         
+
+         //no more as tm13-16 are in tx
          assertNull(m);
          
          res.end(xid1, XAResource.TMSUCCESS);
          
          //prepare it
-         
          res.prepare(xid1);
                   
          conn3 = cf.createXAConnection();
@@ -773,7 +781,7 @@
          
          log.trace("rolling back the tx");
          
-         //rollback
+         //rollback, tm9 to tm16 are gone, tm1 to tm4 are pushed back to queue for redeliver
          res3.rollback(xids[0]);
          
          log.trace("rolledb back the tx");
@@ -782,7 +790,6 @@
          
          conn2.close();
          
-         
          conn1 = cf.createConnection();
          
          conn1.start();
@@ -813,6 +820,10 @@
          
          m = cons1.receive(1000);
          
+         if (m != null)
+         {
+            log.info("---message received: " + ((TextMessage)m).getText());
+         }
          assertNull(m);
                   
          cons2 = sess1.createConsumer(queue3);
@@ -4194,24 +4205,5 @@
 
       }
    }
-   
-   private void pause(String prompt)
-   {
-      
-      System.out.println(prompt);
-      
-      try
-      {
-         System.in.read();
-      }
-      catch (IOException e)
-      {
-         // TODO Auto-generated catch block
-         e.printStackTrace();
-      }
-      
-      System.out.println("going on...");
-   }
-
 }