Author: aidan
Date: Wed Sep 16 11:32:28 2009
New Revision: 815729
URL: http://svn.apache.org/viewvc?rev=815729&view=rev
Log:
QPID-2015: Remove AMQIoTransportProtocolSession. Release the executor service
in the same class as it's acquired
Removed:
qpid/branches/java-network-refactor/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQIoTransportProtocolSession.java
Modified:
qpid/branches/java-network-refactor/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
qpid/branches/java-network-refactor/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
qpid/branches/java-network-refactor/qpid/java/common/src/main/java/org/apache/qpid/pool/PoolingFilter.java
Modified:
qpid/branches/java-network-refactor/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-network-refactor/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java?rev=815729&r1=815728&r2=815729&view=diff
==============================================================================
---
qpid/branches/java-network-refactor/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
(original)
+++
qpid/branches/java-network-refactor/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
Wed Sep 16 11:32:28 2009
@@ -706,7 +706,7 @@
}
_closed = true;
-
+ _poolReference.releaseExecutorService();
CurrentActor.get().message(_logSubject,
ConnectionMessages.CON_1002());
}
}
Modified:
qpid/branches/java-network-refactor/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-network-refactor/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java?rev=815729&r1=815728&r2=815729&view=diff
==============================================================================
---
qpid/branches/java-network-refactor/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
(original)
+++
qpid/branches/java-network-refactor/qpid/java/client/src/main/java/org/apache/qpid/client/protocol/AMQProtocolHandler.java
Wed Sep 16 11:32:28 2009
@@ -716,6 +716,7 @@
_logger.debug("FailoverException interrupted connection close,
ignoring as connection close anyway.");
}
}
+ _poolReference.releaseExecutorService();
}
/** @return the number of bytes read from this protocol session */
Modified:
qpid/branches/java-network-refactor/qpid/java/common/src/main/java/org/apache/qpid/pool/PoolingFilter.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-network-refactor/qpid/java/common/src/main/java/org/apache/qpid/pool/PoolingFilter.java?rev=815729&r1=815728&r2=815729&view=diff
==============================================================================
---
qpid/branches/java-network-refactor/qpid/java/common/src/main/java/org/apache/qpid/pool/PoolingFilter.java
(original)
+++
qpid/branches/java-network-refactor/qpid/java/common/src/main/java/org/apache/qpid/pool/PoolingFilter.java
Wed Sep 16 11:32:28 2009
@@ -136,9 +136,6 @@
public void destroy()
{
_logger.debug("Destroy called on PoolingFilter " + toString());
-
- // When the reference count gets to zero we release the executor
service.
- _poolReference.releaseExecutorService();
}
/**
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
