[hornetq-commits] JBoss hornetq SVN: r11430 - in branches/Branch_2_2_EAP: src/main/org/hornetq/core/server/cluster/impl and 1 other directories.

[do-not-reply at jboss.org]

Author: clebert.suconic at jboss.com
Date: 2011-09-26 22:59:26 -0400 (Mon, 26 Sep 2011)
New Revision: 11430

Modified:
   branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java
   branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java
   branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/InterruptedLargeMessageTest.java
Log:
fixing a test

Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java	2011-09-26 16:16:31 UTC (rev 11429)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java	2011-09-27 02:59:26 UTC (rev 11430)
@@ -459,6 +459,11 @@
                   for (PagedMessage msg : messages)
                   {
                      pageCache.addLiveMessage(msg);
+                     if (msg.getMessage().isLargeMessage())
+                     {
+                        // We have to do this since addLIveMessage will increment an extra one
+                        ((LargeServerMessage)msg.getMessage()).decrementDelayDeletionCount();
+                     }
                   }
 
                   currentPage.setLiveCache(pageCache);

Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java
===================================================================
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java	2011-09-26 16:16:31 UTC (rev 11429)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java	2011-09-27 02:59:26 UTC (rev 11430)
@@ -69,6 +69,7 @@
  * A ClusterConnectionImpl
  *
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ * @author Clebert Suconic
  * 
  * Created 21 Jan 2009 14:43:05
  *

Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/InterruptedLargeMessageTest.java
===================================================================
--- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/InterruptedLargeMessageTest.java	2011-09-26 16:16:31 UTC (rev 11429)
+++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/InterruptedLargeMessageTest.java	2011-09-27 02:59:26 UTC (rev 11430)
@@ -285,6 +285,8 @@
             producer.send(clientFile);
          }
          session.commit();
+         
+         validateNoFilesOnLargeDir(10);
 
          for (int h = 0; h < 5; h++)
          {
@@ -307,8 +309,6 @@
             for (int i = 0; i < 10; i++)
             {
                ClientMessage clientMessage = cons.receive(5000);
-               
-               System.out.println("msg " + clientMessage);
                assertNotNull(clientMessage);
                for (int countByte = 0; countByte < messageSize; countByte++)
                {
@@ -324,8 +324,11 @@
             {
                session.rollback();
             }
+            
+            session.close();
+            sf.close();
          }
-
+         
          server.stop(false);
          server.start();