[jboss-cvs] JBoss Messaging SVN: r5595 - in trunk: src/main/org/jboss/messaging/core/paging/impl and 1 other directories.

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

Author: clebert.suconic at jboss.com
Date: 2009-01-07 16:58:52 -0500 (Wed, 07 Jan 2009)
New Revision: 5595

Modified:
   trunk/src/main/org/jboss/messaging/core/paging/PagingManager.java
   trunk/src/main/org/jboss/messaging/core/paging/PagingStoreFactory.java
   trunk/src/main/org/jboss/messaging/core/paging/impl/PagingManagerImpl.java
   trunk/src/main/org/jboss/messaging/core/paging/impl/PagingStoreFactoryNIO.java
   trunk/tests/src/org/jboss/messaging/tests/integration/paging/PagingManagerIntegrationTest.java
Log:
tweaks

Modified: trunk/src/main/org/jboss/messaging/core/paging/PagingManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/paging/PagingManager.java	2009-01-07 18:11:18 UTC (rev 5594)
+++ trunk/src/main/org/jboss/messaging/core/paging/PagingManager.java	2009-01-07 21:58:52 UTC (rev 5595)
@@ -118,13 +118,6 @@
     * */
    PageTransactionInfo getTransaction(long transactionID);
 
-   /** 
-    * 
-    * To be called when there are no more references to the message
-    * @param message
-    */
-   void messageDone(ServerMessage message) throws Exception;
-
    /** To be called when an message is being added to the address.
     *  @return false is the address is full */
    boolean addSize(ServerMessage message) throws Exception;

Modified: trunk/src/main/org/jboss/messaging/core/paging/PagingStoreFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/paging/PagingStoreFactory.java	2009-01-07 18:11:18 UTC (rev 5594)
+++ trunk/src/main/org/jboss/messaging/core/paging/PagingStoreFactory.java	2009-01-07 21:58:52 UTC (rev 5595)
@@ -23,7 +23,6 @@
 package org.jboss.messaging.core.paging;
 
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.Executor;
 
 import org.jboss.messaging.core.journal.SequentialFileFactory;

Modified: trunk/src/main/org/jboss/messaging/core/paging/impl/PagingManagerImpl.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/paging/impl/PagingManagerImpl.java	2009-01-07 18:11:18 UTC (rev 5594)
+++ trunk/src/main/org/jboss/messaging/core/paging/impl/PagingManagerImpl.java	2009-01-07 21:58:52 UTC (rev 5595)
@@ -189,11 +189,6 @@
       return getPageStore(destination).isPaging();
    }
 
-   public void messageDone(final ServerMessage message) throws Exception
-   {
-      getPageStore(message.getDestination()).addSize(-message.getMemoryEstimate());
-   }
-
    public boolean addSize(final ServerMessage message) throws Exception
    {
       return getPageStore(message.getDestination()).addSize(message.getMemoryEstimate());

Modified: trunk/src/main/org/jboss/messaging/core/paging/impl/PagingStoreFactoryNIO.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/paging/impl/PagingStoreFactoryNIO.java	2009-01-07 18:11:18 UTC (rev 5594)
+++ trunk/src/main/org/jboss/messaging/core/paging/impl/PagingStoreFactoryNIO.java	2009-01-07 21:58:52 UTC (rev 5595)
@@ -28,7 +28,6 @@
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.InputStreamReader;
-import java.io.OutputStream;
 import java.io.OutputStreamWriter;
 import java.util.ArrayList;
 import java.util.Collections;

Modified: trunk/tests/src/org/jboss/messaging/tests/integration/paging/PagingManagerIntegrationTest.java
===================================================================
--- trunk/tests/src/org/jboss/messaging/tests/integration/paging/PagingManagerIntegrationTest.java	2009-01-07 18:11:18 UTC (rev 5594)
+++ trunk/tests/src/org/jboss/messaging/tests/integration/paging/PagingManagerIntegrationTest.java	2009-01-07 21:58:52 UTC (rev 5595)
@@ -140,7 +140,7 @@
          assertEquals(currentSize, managerImpl.getPageStore(new SimpleString("simple-test")).getAddressSize());
       }
 
-      managerImpl.messageDone(msg);
+      managerImpl.getPageStore(msg.getDestination()).addSize(-msg.getMemoryEstimate());
 
       assertTrue(managerImpl.addSize(msg));