[hornetq-commits] JBoss hornetq SVN: r9064 - in trunk: tests/src/org/hornetq/tests/integration/client and 1 other directory.

[do-not-reply at jboss.org]

Author: clebert.suconic at jboss.com
Date: 2010-04-06 19:24:37 -0400 (Tue, 06 Apr 2010)
New Revision: 9064

Modified:
   trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java
   trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java
Log:
HORNETQ-353 - fixing paging and the stress testsuite

Modified: trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java	2010-04-06 15:31:44 UTC (rev 9063)
+++ trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java	2010-04-06 23:24:37 UTC (rev 9064)
@@ -832,6 +832,13 @@
          }
 
          PagedMessage pagedMessage;
+         
+         if (!message.isDurable())
+         {
+            // The address should never be transient when paging (even for non-persistent messages when paging)
+            // This will force everything to be persisted
+            message.bodyChanged();
+         }
 
          if (transactionID != -1)
          {

Modified: trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java	2010-04-06 15:31:44 UTC (rev 9063)
+++ trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java	2010-04-06 23:24:37 UTC (rev 9064)
@@ -81,8 +81,19 @@
 
    // Public --------------------------------------------------------
 
-   public void testSendReceivePaging() throws Exception
+   public void testSendReceivePagingPersistent() throws Exception
    {
+      internaltestSendReceivePaging(true);
+   }
+
+
+   public void testSendReceivePagingNonPersistent() throws Exception
+   {
+      internaltestSendReceivePaging(false);
+   }
+
+   private void internaltestSendReceivePaging(final boolean persistentMessages) throws Exception
+   {
       clearData();
 
       Configuration config = createDefaultConfig();
@@ -126,7 +137,7 @@
 
          for (int i = 0; i < numberOfMessages; i++)
          {
-            message = session.createMessage(true);
+            message = session.createMessage(persistentMessages);
 
             HornetQBuffer bodyLocal = message.getBodyBuffer();
 
@@ -140,15 +151,18 @@
          session.close();
 
 
-         server.stop();
+         if (persistentMessages)
+         {
+            server.stop();
+   
+            server = createServer(true,
+                                  config,
+                                  PagingTest.PAGE_SIZE,
+                                  PagingTest.PAGE_MAX,
+                                  new HashMap<String, AddressSettings>());
+            server.start();
+         }
 
-         server = createServer(true,
-                               config,
-                               PagingTest.PAGE_SIZE,
-                               PagingTest.PAGE_MAX,
-                               new HashMap<String, AddressSettings>());
-         server.start();
-
          sf = createInVMFactory();
 
          session = sf.createSession(null, null, false, true, true, false, 0);