[jboss-cvs] JBoss Messaging SVN: r8338 - in branches/JBMESSAGING_1876: src/main/org/jboss/jms/server/connectionfactory and 2 other directories.

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

Author: gaohoward
Date: 2011-06-14 10:04:50 -0400 (Tue, 14 Jun 2011)
New Revision: 8338

Modified:
   branches/JBMESSAGING_1876/src/main/org/jboss/jms/client/container/ClientConsumer.java
   branches/JBMESSAGING_1876/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactory.java
   branches/JBMESSAGING_1876/tests/src/org/jboss/test/messaging/jms/ConnectionFactoryTest.java
   branches/JBMESSAGING_1876/tests/src/org/jboss/test/messaging/jms/clustering/ClusteredConnectionFactoryTest.java
Log:
fix test issue


Modified: branches/JBMESSAGING_1876/src/main/org/jboss/jms/client/container/ClientConsumer.java
===================================================================
--- branches/JBMESSAGING_1876/src/main/org/jboss/jms/client/container/ClientConsumer.java	2011-06-14 12:36:13 UTC (rev 8337)
+++ branches/JBMESSAGING_1876/src/main/org/jboss/jms/client/container/ClientConsumer.java	2011-06-14 14:04:50 UTC (rev 8338)
@@ -632,7 +632,8 @@
 
                      long tmUsed = System.currentTimeMillis() - startTimestamp;
                      
-                     long timeLeft = (timeout - tmUsed) <= 0 ? minTimeoutProcessTime : tmUsed + minTimeoutProcessTime;
+                     long timeDelta = timeout - tmUsed;
+                     long timeLeft = timeDelta <= 0 ? minTimeoutProcessTime : (timeDelta + minTimeoutProcessTime);
                      
                      if (trace)
                      {

Modified: branches/JBMESSAGING_1876/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactory.java
===================================================================
--- branches/JBMESSAGING_1876/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactory.java	2011-06-14 12:36:13 UTC (rev 8337)
+++ branches/JBMESSAGING_1876/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactory.java	2011-06-14 14:04:50 UTC (rev 8338)
@@ -93,7 +93,7 @@
    
    private long retryChangeRateInterval = 5000;
    
-   private long minTimeoutProcessTime = 100;
+   private long minTimeoutProcessTime = 300;
 
    // Constructors ---------------------------------------------------------------------------------
 

Modified: branches/JBMESSAGING_1876/tests/src/org/jboss/test/messaging/jms/ConnectionFactoryTest.java
===================================================================
--- branches/JBMESSAGING_1876/tests/src/org/jboss/test/messaging/jms/ConnectionFactoryTest.java	2011-06-14 12:36:13 UTC (rev 8337)
+++ branches/JBMESSAGING_1876/tests/src/org/jboss/test/messaging/jms/ConnectionFactoryTest.java	2011-06-14 14:04:50 UTC (rev 8338)
@@ -1052,7 +1052,7 @@
          
          long minTime = state1.getMinTimeoutProcessTime();
          
-         assertEquals(100, minTime);
+         assertEquals(300, minTime);
       }
       finally
       {

Modified: branches/JBMESSAGING_1876/tests/src/org/jboss/test/messaging/jms/clustering/ClusteredConnectionFactoryTest.java
===================================================================
--- branches/JBMESSAGING_1876/tests/src/org/jboss/test/messaging/jms/clustering/ClusteredConnectionFactoryTest.java	2011-06-14 12:36:13 UTC (rev 8337)
+++ branches/JBMESSAGING_1876/tests/src/org/jboss/test/messaging/jms/clustering/ClusteredConnectionFactoryTest.java	2011-06-14 14:04:50 UTC (rev 8338)
@@ -540,7 +540,7 @@
          
          long minTime = state1.getMinTimeoutProcessTime();
          
-         assertEquals(100, minTime);
+         assertEquals(300, minTime);
       }
       finally
       {