Author: clebert.suconic(a)jboss.com Date: 2010-12-02 16:51:09 -0500 (Thu, 02 Dec 2010) New Revision: 9986 Modified: branches/Branch_Large_Message_Compression/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java branches/Branch_Large_Message_Compression/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java branches/Branch_Large_Message_Compression/src/main/org/hornetq/core/client/impl/ClientSessionInternal.java branches/Branch_Large_Message_Compression/src/main/org/hornetq/core/client/impl/DelegatingSession.java branches/Branch_Large_Message_Compression/src/main/org/hornetq/core/client/impl/FailoverManager.java branches/Branch_Large_Message_Compression/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java branches/Branch_Large_Message_Compression/src/main/org/hornetq/utils/DecompressedLargeMessageBuffer.java Log: just removing the thread pool Modified: branches/Branch_Large_Message_Compression/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java =================================================================== --- branches/Branch_Large_Message_Compression/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java 2010-12-02 18:08:38 UTC (rev 9985) +++ branches/Branch_Large_Message_Compression/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java 2010-12-02 21:51:09 UTC (rev 9986) @@ -552,7 +552,7 @@ if (currentChunkMessage.isCompressed()) { - currentChunkMessage.setBuffer(new DecompressedLargeMessageBuffer(currentLargeMessageBuffer, session.getThreadPool())); + currentChunkMessage.setBuffer(new DecompressedLargeMessageBuffer(currentLargeMessageBuffer)); } else { Modified: branches/Branch_Large_Message_Compression/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java =================================================================== --- branches/Branch_Large_Message_Compression/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2010-12-02 18:08:38 UTC (rev 9985) +++ branches/Branch_Large_Message_Compression/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2010-12-02 21:51:09 UTC (rev 9986) @@ -272,15 +272,6 @@ // ClientSession implementation // ----------------------------------------------------------------- - /** - * This will be used for instance when compressin large messages. - * the compression has to be done through a PipedOutputStream, and that needs to be done on a different thread - */ - public Executor getThreadPool() - { - return failoverManager.getThreadPool(); - } - public void createQueue(final SimpleString address, final SimpleString queueName) throws HornetQException { internalCreateQueue(address, queueName, null, false, false); Modified: branches/Branch_Large_Message_Compression/src/main/org/hornetq/core/client/impl/ClientSessionInternal.java =================================================================== --- branches/Branch_Large_Message_Compression/src/main/org/hornetq/core/client/impl/ClientSessionInternal.java 2010-12-02 18:08:38 UTC (rev 9985) +++ branches/Branch_Large_Message_Compression/src/main/org/hornetq/core/client/impl/ClientSessionInternal.java 2010-12-02 21:51:09 UTC (rev 9986) @@ -13,8 +13,6 @@ package org.hornetq.core.client.impl; -import java.util.concurrent.Executor; - import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Message; import org.hornetq.api.core.SimpleString; @@ -89,6 +87,4 @@ void setAddress(Message message, SimpleString address); void setPacketSize(int packetSize); - - Executor getThreadPool(); } Modified: branches/Branch_Large_Message_Compression/src/main/org/hornetq/core/client/impl/DelegatingSession.java =================================================================== --- branches/Branch_Large_Message_Compression/src/main/org/hornetq/core/client/impl/DelegatingSession.java 2010-12-02 18:08:38 UTC (rev 9985) +++ branches/Branch_Large_Message_Compression/src/main/org/hornetq/core/client/impl/DelegatingSession.java 2010-12-02 21:51:09 UTC (rev 9986) @@ -14,7 +14,6 @@ package org.hornetq.core.client.impl; import java.util.Set; -import java.util.concurrent.Executor; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; @@ -564,12 +563,4 @@ { return session.isCompressLargeMessages(); } - - /* (non-Javadoc) - * @see org.hornetq.core.client.impl.ClientSessionInternal#getThreadPool() - */ - public Executor getThreadPool() - { - return session.getThreadPool(); - } } Modified: branches/Branch_Large_Message_Compression/src/main/org/hornetq/core/client/impl/FailoverManager.java =================================================================== --- branches/Branch_Large_Message_Compression/src/main/org/hornetq/core/client/impl/FailoverManager.java 2010-12-02 18:08:38 UTC (rev 9985) +++ branches/Branch_Large_Message_Compression/src/main/org/hornetq/core/client/impl/FailoverManager.java 2010-12-02 21:51:09 UTC (rev 9986) @@ -66,6 +66,4 @@ boolean removeFailureListener(SessionFailureListener listener); void causeExit(); - - Executor getThreadPool(); } Modified: branches/Branch_Large_Message_Compression/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java =================================================================== --- branches/Branch_Large_Message_Compression/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java 2010-12-02 18:08:38 UTC (rev 9985) +++ branches/Branch_Large_Message_Compression/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java 2010-12-02 21:51:09 UTC (rev 9986) @@ -298,11 +298,6 @@ } // FailoverManager implementation ------------------------------------------------------------------ - - public Executor getThreadPool() - { - return threadPool; - } public ClientSession createSession(final String username, final String password, Modified: branches/Branch_Large_Message_Compression/src/main/org/hornetq/utils/DecompressedLargeMessageBuffer.java =================================================================== --- branches/Branch_Large_Message_Compression/src/main/org/hornetq/utils/DecompressedLargeMessageBuffer.java 2010-12-02 18:08:38 UTC (rev 9985) +++ branches/Branch_Large_Message_Compression/src/main/org/hornetq/utils/DecompressedLargeMessageBuffer.java 2010-12-02 21:51:09 UTC (rev 9986) @@ -44,18 +44,14 @@ private static final String OPERATION_NOT_SUPPORTED = "Operation not supported"; - private static final String READ_ONLY_ERROR_MESSAGE = "This is a read-only buffer, setOperations are not supported"; - // Attributes ---------------------------------------------------- final LargeMessageBufferInternal bufferDelegate; - - private long readerIndex = 0; // Static -------------------------------------------------------- // Constructors -------------------------------------------------- - public DecompressedLargeMessageBuffer(final LargeMessageBufferInternal bufferDelegate, Executor executor) + public DecompressedLargeMessageBuffer(final LargeMessageBufferInternal bufferDelegate) { this.bufferDelegate = bufferDelegate; }