Author: clebert.suconic(a)jboss.com Date: 2010-02-04 14:23:40 -0500 (Thu, 04 Feb 2010) New Revision: 8863 Modified: trunk/src/main/org/hornetq/core/persistence/OperationContext.java trunk/src/main/org/hornetq/core/persistence/StorageManager.java trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java trunk/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java trunk/src/main/org/hornetq/core/server/cluster/impl/Redistributor.java trunk/src/main/org/hornetq/core/server/impl/QueueImpl.java trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java Log: Removing complete operation as it is not used Modified: trunk/src/main/org/hornetq/core/persistence/OperationContext.java =================================================================== --- trunk/src/main/org/hornetq/core/persistence/OperationContext.java 2010-02-04 10:37:19 UTC (rev 8862) +++ trunk/src/main/org/hornetq/core/persistence/OperationContext.java 2010-02-04 19:23:40 UTC (rev 8863) @@ -35,9 +35,6 @@ void replicationDone(); - /** To be called when there are no more operations pending */ - void complete(); - void waitCompletion() throws Exception; boolean waitCompletion(long timeout) throws Exception; Modified: trunk/src/main/org/hornetq/core/persistence/StorageManager.java =================================================================== --- trunk/src/main/org/hornetq/core/persistence/StorageManager.java 2010-02-04 10:37:19 UTC (rev 8862) +++ trunk/src/main/org/hornetq/core/persistence/StorageManager.java 2010-02-04 19:23:40 UTC (rev 8863) @@ -78,9 +78,6 @@ * @throws Exception */ void waitOnOperations() throws Exception; - /** To close the OperationsContext */ - void completeOperations(); - void clearContext(); UUID getPersistentID(); Modified: trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java =================================================================== --- trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2010-02-04 10:37:19 UTC (rev 8862) +++ trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2010-02-04 19:23:40 UTC (rev 8863) @@ -292,14 +292,6 @@ perfBlastPages = config.getJournalPerfBlastPages(); } - /* (non-Javadoc) - * @see org.hornetq.core.persistence.StorageManager#completeReplication() - */ - public void completeOperations() - { - getContext().complete(); - } - public void clearContext() { OperationContextImpl.clearContext(); Modified: trunk/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java =================================================================== --- trunk/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java 2010-02-04 10:37:19 UTC (rev 8862) +++ trunk/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java 2010-02-04 19:23:40 UTC (rev 8863) @@ -501,7 +501,6 @@ } finally { - storageManager.completeOperations(); storageManager.clearContext(); } } Modified: trunk/src/main/org/hornetq/core/server/cluster/impl/Redistributor.java =================================================================== --- trunk/src/main/org/hornetq/core/server/cluster/impl/Redistributor.java 2010-02-04 10:37:19 UTC (rev 8862) +++ trunk/src/main/org/hornetq/core/server/cluster/impl/Redistributor.java 2010-02-04 19:23:40 UTC (rev 8863) @@ -160,8 +160,6 @@ execPrompter(); } }); - - storageManager.completeOperations(); } private void execPrompter() Modified: trunk/src/main/org/hornetq/core/server/impl/QueueImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/QueueImpl.java 2010-02-04 10:37:19 UTC (rev 8862) +++ trunk/src/main/org/hornetq/core/server/impl/QueueImpl.java 2010-02-04 19:23:40 UTC (rev 8863) @@ -584,8 +584,6 @@ { acknowledge(ref); } - - storageManager.completeOperations(); } public void setExpiryAddress(final SimpleString expiryAddress) Modified: trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java 2010-02-04 10:37:19 UTC (rev 8862) +++ trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java 2010-02-04 19:23:40 UTC (rev 8863) @@ -463,9 +463,6 @@ Assert.assertEquals(msg, msgsResult.get(1)); - // Clearing any exception from the Context, so we can use the context again - ctx.complete(); - final CountDownLatch latch3 = new CountDownLatch(1); ctx.executeOnCompletion(new IOAsyncTask()