[jboss-cvs] JBoss Messaging SVN: r6624 - in trunk: tests/src/org/jboss/messaging/tests/unit/core/client/impl and 1 other directory.

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

Author: clebert.suconic at jboss.com
Date: 2009-04-29 11:45:32 -0400 (Wed, 29 Apr 2009)
New Revision: 6624

Modified:
   trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java
   trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerInternal.java
   trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/LargeMessageBufferTest.java
Log:
Reverting synchronized block on flowControl until I can find a better solution

Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java	2009-04-29 14:56:00 UTC (rev 6623)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java	2009-04-29 15:45:32 UTC (rev 6624)
@@ -456,11 +456,6 @@
       return buffer.size();
    }
 
-   public int getCreditsToSend()
-   {
-      return creditsToSend;
-   }
-
    public void acknowledge(final ClientMessage message) throws MessagingException
    {
       ackBytes += message.getEncodeSize();
@@ -488,7 +483,7 @@
     * LargeMessageBuffer will call flowcontrol here, while other handleMessage will also be calling flowControl.
     * So, this operation needs to be atomic.
     * */
-   public synchronized void flowControl(final int messageBytes, final boolean isLargeMessage) throws MessagingException
+   public void flowControl(final int messageBytes, final boolean isLargeMessage) throws MessagingException
    {
       if (clientWindowSize >= 0)
       {

Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerInternal.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerInternal.java	2009-04-29 14:56:00 UTC (rev 6623)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientConsumerInternal.java	2009-04-29 15:45:32 UTC (rev 6624)
@@ -53,8 +53,6 @@
 
    int getBufferSize();
 
-   int getCreditsToSend();
-
    void cleanUp() throws MessagingException;
    
    void acknowledge(ClientMessage message) throws MessagingException;

Modified: trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/LargeMessageBufferTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/LargeMessageBufferTest.java	2009-04-29 14:56:00 UTC (rev 6623)
+++ trunk/tests/src/org/jboss/messaging/tests/unit/core/client/impl/LargeMessageBufferTest.java	2009-04-29 15:45:32 UTC (rev 6624)
@@ -573,15 +573,6 @@
       }
 
       /* (non-Javadoc)
-       * @see org.jboss.messaging.core.client.impl.ClientConsumerInternal#getCreditsToSend()
-       */
-      public int getCreditsToSend()
-      {
-
-         return 0;
-      }
-
-      /* (non-Javadoc)
        * @see org.jboss.messaging.core.client.impl.ClientConsumerInternal#getID()
        */
       public long getID()