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

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

Author: clebert.suconic at jboss.com
Date: 2009-04-09 22:01:41 -0400 (Thu, 09 Apr 2009)
New Revision: 6390

Modified:
   branches/Branch_Temp_Clebert_LargeMessage/src/main/org/jboss/messaging/core/client/impl/LargeMessageBuffer.java
   branches/Branch_Temp_Clebert_LargeMessage/tests/src/org/jboss/messaging/tests/integration/chunkmessage/ChunkTestBase.java
Log:
tweaks before merge

Modified: branches/Branch_Temp_Clebert_LargeMessage/src/main/org/jboss/messaging/core/client/impl/LargeMessageBuffer.java
===================================================================
--- branches/Branch_Temp_Clebert_LargeMessage/src/main/org/jboss/messaging/core/client/impl/LargeMessageBuffer.java	2009-04-09 19:52:14 UTC (rev 6389)
+++ branches/Branch_Temp_Clebert_LargeMessage/src/main/org/jboss/messaging/core/client/impl/LargeMessageBuffer.java	2009-04-10 02:01:41 UTC (rev 6390)
@@ -103,7 +103,13 @@
    {
       if (outStream == null)
       {
-         checkForPacket(this.totalSize - 1);
+         try
+         {
+            checkForPacket(this.totalSize - 1);
+         }
+         catch (Exception ignored)
+         {
+         }
       }
    }
 

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:52:14 UTC (rev 6389)
+++ branches/Branch_Temp_Clebert_LargeMessage/tests/src/org/jboss/messaging/tests/integration/chunkmessage/ChunkTestBase.java	2009-04-10 02:01:41 UTC (rev 6390)
@@ -413,18 +413,17 @@
    {
       for (int i = 0; i < numberOfMessages; i++)
       {
-         System.out.println("Sending message " + i);
          ClientMessage message = session.createClientMessage(true);
          
          // 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");
+            System.out.println("Sending message (stream)" + i);
             message.setBodyInputStream(createFakeLargeStream(numberOfBytes, (byte)'a'));
          }
          else
          {
-            System.out.println("Sent using array");
+            System.out.println("Sending message (array)" + i);
             byte[] bytes = new byte[numberOfBytes];
             for (int j = 0; j < bytes.length; j++)
             {