Author: robbie
Date: Thu May 22 15:00:08 2014
New Revision: 1596894
URL: http://svn.apache.org/r1596894
Log:
QPID-5771: ensure the closed event is passed to the listener even if closing
the endpoint input throws something, ensure the connection is unregistered from
the connection registry
Modified:
qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0_SASL.java
Modified:
qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0_SASL.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0_SASL.java?rev=1596894&r1=1596893&r2=1596894&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0_SASL.java
(original)
+++
qpid/trunk/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0_SASL.java
Thu May 22 15:00:08 2014
@@ -34,7 +34,6 @@ import javax.security.sasl.SaslException
import javax.security.sasl.SaslServer;
import org.apache.log4j.Logger;
-
import org.apache.qpid.amqp_1_0.codec.FrameWriter;
import org.apache.qpid.amqp_1_0.codec.ProtocolHandler;
import org.apache.qpid.amqp_1_0.framing.AMQFrame;
@@ -433,10 +432,16 @@ public class ProtocolEngine_1_0_0_SASL i
try
{
// todo
- _endpoint.inputClosed();
- if (_endpoint != null && _endpoint.getConnectionEventListener() !=
null)
+ try
{
- ((Connection_1_0)
_endpoint.getConnectionEventListener()).closed();
+ _endpoint.inputClosed();
+ }
+ finally
+ {
+ if (_endpoint != null &&
_endpoint.getConnectionEventListener() != null)
+ {
+ ((Connection_1_0)
_endpoint.getConnectionEventListener()).closed();
+ }
}
}
catch(RuntimeException e)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
