[jboss-cvs] JBoss Messaging SVN: r3154 - trunk/src/main/org/jboss/jms/client/container.

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

Author: clebert.suconic at jboss.com
Date: 2007-09-27 22:52:04 -0400 (Thu, 27 Sep 2007)
New Revision: 3154

Modified:
   trunk/src/main/org/jboss/jms/client/container/ClientConsumer.java
Log:
http://jira.jboss.com/jira/browse/JBMESSAGING-1085 - fixing waitForever in some situations

Modified: trunk/src/main/org/jboss/jms/client/container/ClientConsumer.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/ClientConsumer.java	2007-09-28 02:29:46 UTC (rev 3153)
+++ trunk/src/main/org/jboss/jms/client/container/ClientConsumer.java	2007-09-28 02:52:04 UTC (rev 3154)
@@ -487,7 +487,13 @@
                if (timeout != 0)
                {
                   timeout -= System.currentTimeMillis() - startTimestamp;
-               }                            
+                  if (timeout == 0)
+                  {
+                     // As 0 means waitForever, we make it noWait
+                     timeout = -1;
+                  }
+
+               }
             }           
          }
          finally