[jboss-cvs] JBoss Messaging SVN: r2347 - in trunk/src/main/org/jboss/jms: server/endpoint and 1 other directory.

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

Author: timfox
Date: 2007-02-19 07:42:29 -0500 (Mon, 19 Feb 2007)
New Revision: 2347

Modified:
   trunk/src/main/org/jboss/jms/client/remoting/MessageCallbackHandler.java
   trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java
Log:
more flow control tweaks


Modified: trunk/src/main/org/jboss/jms/client/remoting/MessageCallbackHandler.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/remoting/MessageCallbackHandler.java	2007-02-19 12:30:36 UTC (rev 2346)
+++ trunk/src/main/org/jboss/jms/client/remoting/MessageCallbackHandler.java	2007-02-19 12:42:29 UTC (rev 2347)
@@ -478,36 +478,28 @@
       return m;
    } 
    
-   //We can optimise so it just uses one int to store both flags
+   private volatile boolean serverSending = true;
    
-   private volatile boolean sentStop;
-   
-   private volatile boolean sentStart = true;
-   
    private void checkBufferSize()
    {
       int size = buffer.size();
       
-      if (!sentStart && size <= minBufferSize)
+      if (!serverSending && size <= minBufferSize)
       {
          //We need more messages - we need to tell the server this if we haven't done so already
          
          sendChangeRateMessage(1.0f);
          
-         sentStart = true;
-         
-         sentStop = false;
+         serverSending = true;
       }
-      else if (!sentStop && size >= maxBufferSize)
+      else if (serverSending && size >= maxBufferSize)
       {
          //Our buffer is full - we need to tell the server to stop sending if we haven't
          //done so already
          
          sendChangeRateMessage(0f);
          
-         sentStop = true;
-         
-         sentStart = false;
+         serverSending = false;
       }
    }
    

Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java	2007-02-19 12:30:36 UTC (rev 2346)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java	2007-02-19 12:42:29 UTC (rev 2347)
@@ -384,13 +384,8 @@
          
          if (clientAccepting)
          {
-            log.info(this + "Toggle on");
             promptDelivery();
          }            
-         else
-         {
-            log.info(this + "Toggle off");
-         }
       }   
       catch (Throwable t)
       {