From do-not-reply at jboss.org Mon Sep 26 22:59:27 2011
Content-Type: multipart/mixed; boundary="===============4519618736138087633=="
MIME-Version: 1.0
From: do-not-reply at jboss.org
To: hornetq-commits at lists.jboss.org
Subject: [hornetq-commits] JBoss hornetq SVN: r11430 - in
 branches/Branch_2_2_EAP: src/main/org/hornetq/core/server/cluster/impl and 1
 other directories.
Date: Mon, 26 Sep 2011 22:59:26 -0400
Message-ID: <201109270259.p8R2xQ3o009633@svn01.web.mwc.hst.phx2.redhat.com>

--===============4519618736138087633==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: clebert.suconic(a)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/PagingStor=
eImpl.java
   branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/Cl=
usterConnectionImpl.java
   branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/client/I=
nterruptedLargeMessageTest.java
Log:
fixing a test

Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/impl/Pag=
ingStoreImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/impl/PagingSto=
reImpl.java	2011-09-26 16:16:31 UTC (rev 11429)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/paging/impl/PagingSto=
reImpl.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 in=
crement an extra one
+                        ((LargeServerMessage)msg.getMessage()).decrementDe=
layDeletionCount();
+                     }
                   }
 =

                   currentPage.setLiveCache(pageCache);

Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/=
impl/ClusterConnectionImpl.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/C=
lusterConnectionImpl.java	2011-09-26 16:16:31 UTC (rev 11429)
+++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/server/cluster/impl/C=
lusterConnectionImpl.java	2011-09-27 02:59:26 UTC (rev 11430)
@@ -69,6 +69,7 @@
  * A ClusterConnectionImpl
  *
  * @author <a href=3D"mailto:tim.fox(a)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/c=
lient/InterruptedLargeMessageTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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 =3D 0; h < 5; h++)
          {
@@ -307,8 +309,6 @@
             for (int i =3D 0; i < 10; i++)
             {
                ClientMessage clientMessage =3D cons.receive(5000);
-               =

-               System.out.println("msg " + clientMessage);
                assertNotNull(clientMessage);
                for (int countByte =3D 0; countByte < messageSize; countByt=
e++)
                {
@@ -324,8 +324,11 @@
             {
                session.rollback();
             }
+            =

+            session.close();
+            sf.close();
          }
-
+         =

          server.stop(false);
          server.start();
 =



--===============4519618736138087633==--