[jboss-cvs] JBoss Messaging SVN: r5272 - in trunk: tests/src/org/jboss/messaging/tests/integration/cluster and 1 other directory.

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

Author: timfox
Date: 2008-11-05 04:23:06 -0500 (Wed, 05 Nov 2008)
New Revision: 5272

Modified:
   trunk/src/main/org/jboss/messaging/core/transaction/impl/ResourceManagerImpl.java
   trunk/tests/src/org/jboss/messaging/tests/integration/cluster/ActivationTimeoutTest.java
Log:
Tweaked test


Modified: trunk/src/main/org/jboss/messaging/core/transaction/impl/ResourceManagerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/transaction/impl/ResourceManagerImpl.java	2008-11-05 00:39:45 UTC (rev 5271)
+++ trunk/src/main/org/jboss/messaging/core/transaction/impl/ResourceManagerImpl.java	2008-11-05 09:23:06 UTC (rev 5272)
@@ -27,6 +27,8 @@
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
+import java.util.Timer;
+import java.util.TimerTask;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -72,7 +74,7 @@
    private final PostOffice postOffice;
 
    private final HierarchicalRepository<QueueSettings> queueSettingsRepository;
-
+   
    public ResourceManagerImpl(final int defaultTimeoutSeconds,
                               final ScheduledExecutorService scheduledExecutor,
                               final StorageManager storageManager,
@@ -139,6 +141,7 @@
    public List<Xid> getPreparedTransactions()
    {
       List<Xid> xids = new ArrayList<Xid>();
+      
       for (Xid xid : transactions.keySet())
       {
          if (transactions.get(xid).getState() == Transaction.State.PREPARED)

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/cluster/ActivationTimeoutTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/cluster/ActivationTimeoutTest.java	2008-11-05 00:39:45 UTC (rev 5271)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/cluster/ActivationTimeoutTest.java	2008-11-05 09:23:06 UTC (rev 5272)
@@ -134,17 +134,20 @@
 
       //The messages should not be delivered until after activationTimeout ms, since
       //session 2 didn't reattach
-        
-      long now = System.currentTimeMillis();
-      
-      ClientMessage message = consumer1.receive(ACTIVATION_TIMEOUT - (now - start));
-      
-      assertNull(message);        
-      
+             
       for (int i = 0; i < numMessages; i++)
       {
-         message = consumer1.receive();
+         ClientMessage message = consumer1.receive(2 * ACTIVATION_TIMEOUT);
          
+         assertNotNull(message);
+         
+         if (i == 0)
+         {
+            long now = System.currentTimeMillis();
+            
+            assertTrue(now - start >= ACTIVATION_TIMEOUT);
+         }
+         
          assertEquals("aardvarks", message.getBody().getString());
 
          assertEquals(i, message.getProperty(new SimpleString("count")));
@@ -152,7 +155,7 @@
          message.acknowledge();
       }
       
-      message = consumer1.receive(1000);
+      ClientMessage message = consumer1.receive(1000);
       
       assertNull(message);
       
@@ -218,21 +221,24 @@
 
       //The messages should not be delivered until after activationTimeout ms, since
       //session 2 didn't reattach
-        
-      long now = System.currentTimeMillis();
-      
+              
       //We now create a new consumer but it shouldn't receive the messages until after the timeout
       
       ClientConsumer consumer3 = session1.createConsumer(ADDRESS);
-      
-      ClientMessage message = consumer3.receive(ACTIVATION_TIMEOUT - (now - start));
-      
-      assertNull(message);        
-      
+               
       for (int i = 0; i < numMessages; i++)
       {
-         message = consumer3.receive();
+         ClientMessage message = consumer3.receive(2 * ACTIVATION_TIMEOUT);
          
+         assertNotNull(message);
+         
+         if (i == 0)
+         {
+            long now = System.currentTimeMillis();
+            
+            assertTrue(now - start >= ACTIVATION_TIMEOUT);
+         }
+         
          assertEquals("aardvarks", message.getBody().getString());
 
          assertEquals(i, message.getProperty(new SimpleString("count")));
@@ -240,7 +246,7 @@
          message.acknowledge();
       }
       
-      message = consumer3.receive(1000);
+      ClientMessage message = consumer3.receive(1000);
       
       assertNull(message);