[jboss-cvs] JBoss Messaging SVN: r6388 - in branches/Branch_Temp_Clebert_LargeMessage: tests/src/org/jboss/messaging/tests/integration/chunkmessage and 1 other directories.

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

Author: clebert.suconic at jboss.com
Date: 2009-04-09 15:10:09 -0400 (Thu, 09 Apr 2009)
New Revision: 6388

Modified:
   branches/Branch_Temp_Clebert_LargeMessage/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java
   branches/Branch_Temp_Clebert_LargeMessage/tests/src/org/jboss/messaging/tests/integration/chunkmessage/ChunkTestBase.java
   branches/Branch_Temp_Clebert_LargeMessage/tests/src/org/jboss/messaging/tests/integration/client/MessageChunkTest.java
Log:
just tweaks

Modified: branches/Branch_Temp_Clebert_LargeMessage/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java
===================================================================
--- branches/Branch_Temp_Clebert_LargeMessage/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java	2009-04-09 19:06:52 UTC (rev 6387)
+++ branches/Branch_Temp_Clebert_LargeMessage/src/main/org/jboss/messaging/core/client/impl/ClientConsumerImpl.java	2009-04-09 19:10:09 UTC (rev 6388)
@@ -13,8 +13,6 @@
 package org.jboss.messaging.core.client.impl;
 
 import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.concurrent.Executor;
 
 import org.jboss.messaging.core.buffers.ChannelBuffers;
@@ -406,8 +404,6 @@
          return;
       }
       
-      System.out.println("Received largeMessage, packetSize = " + packet.getPacketSize());
-      
       // Flow control for the first packet, we will have others
       flowControl(packet.getPacketSize(), true);
 
@@ -489,13 +485,9 @@
       {
          creditsToSend += messageBytes;
          
-         System.out.println("Received " + messageBytes + "  credits, credits to Send = " + creditsToSend + "  clientwindowSize = " + clientWindowSize);
-
          if (creditsToSend >= clientWindowSize)
          {
             
-            System.out.println("Sending credits back");
-
             if (isLargeMessage)
             {
                // Flowcontrol on largeMessages continuations needs to be done in a separate thread or failover would
@@ -636,7 +628,6 @@
             {
                onMessageThread = Thread.currentThread();
 
-               System.out.println("Calling handler " + handler);
                theHandler.onMessage(message);
                
                if (message.isLargeMessage())

Modified: branches/Branch_Temp_Clebert_LargeMessage/tests/src/org/jboss/messaging/tests/integration/chunkmessage/ChunkTestBase.java
===================================================================
--- branches/Branch_Temp_Clebert_LargeMessage/tests/src/org/jboss/messaging/tests/integration/chunkmessage/ChunkTestBase.java	2009-04-09 19:06:52 UTC (rev 6387)
+++ branches/Branch_Temp_Clebert_LargeMessage/tests/src/org/jboss/messaging/tests/integration/chunkmessage/ChunkTestBase.java	2009-04-09 19:10:09 UTC (rev 6388)
@@ -415,7 +415,23 @@
       {
          System.out.println("Sending message " + i);
          ClientMessage message = session.createClientMessage(true);
-         message.setBodyInputStream(createFakeLargeStream(numberOfBytes, (byte)'a'));
+         
+         // If the test is using more than 1M, we will only use the Streaming, as it require too much memory from the test
+         if (numberOfBytes > 1024 * 1024 || i % 2 == 0)
+         {
+            System.out.println("Sent using stream");
+            message.setBodyInputStream(createFakeLargeStream(numberOfBytes, (byte)'a'));
+         }
+         else
+         {
+            System.out.println("Sent using array");
+            byte[] bytes = new byte[numberOfBytes];
+            for (int j = 0; j < bytes.length; j++)
+            {
+               bytes[j] = 'a';
+            }
+            message.getBody().writeBytes(bytes);
+         }
          message.putIntProperty(new SimpleString("counter-message"), i);
          if (delayDelivery > 0)
          {

Modified: branches/Branch_Temp_Clebert_LargeMessage/tests/src/org/jboss/messaging/tests/integration/client/MessageChunkTest.java
===================================================================
--- branches/Branch_Temp_Clebert_LargeMessage/tests/src/org/jboss/messaging/tests/integration/client/MessageChunkTest.java	2009-04-09 19:06:52 UTC (rev 6387)
+++ branches/Branch_Temp_Clebert_LargeMessage/tests/src/org/jboss/messaging/tests/integration/client/MessageChunkTest.java	2009-04-09 19:10:09 UTC (rev 6388)
@@ -83,16 +83,12 @@
 
    public void testMessageChunkFilePersistenceOneMessage() throws Exception
    {
-      testChunks(false, true, false, false, true, false, 1, LARGE_MESSAGE_SIZE, RECEIVE_WAIT_TIME, 0);
+      testChunks(false, true, false, false, true, false, 10, 1024 * 1024, RECEIVE_WAIT_TIME, 0);
    }
 
    public void testMessageChunkFilePersistenceOneMessageConsumer() throws Exception
    {
-      for (int i = 0; i < 100; i++)
-      {
-         System.out.println("#test " + i);
-         testChunks(false, true, false, false, true, true, 1, LARGE_MESSAGE_SIZE, RECEIVE_WAIT_TIME, 0);
-      }
+      testChunks(false, true, false, false, true, true, 1, LARGE_MESSAGE_SIZE, RECEIVE_WAIT_TIME, 0);
    }
 
    public void testMessageChunkFilePersistence() throws Exception