[jboss-cvs] JBoss Messaging SVN: r6603 - in trunk: src/main/org/jboss/messaging/core/remoting/impl/wireformat and 1 other directories.

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

Author: clebert.suconic at jboss.com
Date: 2009-04-28 12:58:08 -0400 (Tue, 28 Apr 2009)
New Revision: 6603

Modified:
   trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java
   trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionReceiveMessage.java
   trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/ConnectionFactoryTest.java
Log:
Fix for JMSTest slowConsumer test

Modified: trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java	2009-04-28 16:07:25 UTC (rev 6602)
+++ trunk/src/main/org/jboss/messaging/core/client/impl/ClientSessionImpl.java	2009-04-28 16:58:08 UTC (rev 6603)
@@ -636,7 +636,11 @@
       {
          ClientMessageInternal clMessage = message.getClientMessage();
 
-         clMessage.setFlowControlSize(message.getPacketSize());
+         if (trace)
+         {
+            log.trace("Setting up flowControlSize to " + message.getRequiredBufferSize() + " on message = " + clMessage);
+         }
+         clMessage.setFlowControlSize(message.getRequiredBufferSize());
 
          consumer.handleMessage(message.getClientMessage());
       }

Modified: trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionReceiveMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionReceiveMessage.java	2009-04-28 16:07:25 UTC (rev 6602)
+++ trunk/src/main/org/jboss/messaging/core/remoting/impl/wireformat/SessionReceiveMessage.java	2009-04-28 16:58:08 UTC (rev 6603)
@@ -155,10 +155,11 @@
       }
       else
       {
-         return BASIC_PACKET_SIZE + DataConstants.SIZE_LONG +
+         return BASIC_PACKET_SIZE + 
+                DataConstants.SIZE_LONG +
                 DataConstants.SIZE_INT +
                 DataConstants.SIZE_BOOLEAN +
-                serverMessage.getEncodeSize();
+                (serverMessage != null ? serverMessage.getEncodeSize() : clientMessage.getEncodeSize());
       }
    }
    public void encodeBody(final MessagingBuffer buffer)

Modified: trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/ConnectionFactoryTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/ConnectionFactoryTest.java	2009-04-28 16:07:25 UTC (rev 6602)
+++ trunk/tests/jms-tests/src/org/jboss/test/messaging/jms/ConnectionFactoryTest.java	2009-04-28 16:58:08 UTC (rev 6603)
@@ -226,8 +226,6 @@
             {
                processed++;
 
-               TextMessage tm = (TextMessage)msg;
-
                if (processed == numMessages - 2)
                {
                   synchronized (waitLock)
@@ -246,8 +244,6 @@
 
             public void onMessage(Message msg)
             {
-               TextMessage tm = (TextMessage)msg;
-               
                processed++;
               
                synchronized (waitLock)