Author: kwall
Date: Tue Dec 27 20:47:43 2016
New Revision: 1776190
URL: http://svn.apache.org/viewvc?rev=1776190&view=rev
Log:
QPID-7531: [Java Broker] [AMQP 1.0] Prevent possibility of NPE during peer
initiated connection close
Modified:
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0.java
Modified:
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0.java?rev=1776190&r1=1776189&r2=1776190&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0.java
(original)
+++
qpid/java/trunk/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/AMQPConnection_1_0.java
Tue Dec 27 20:47:43 2016
@@ -336,6 +336,7 @@ public class AMQPConnection_1_0 extends
closeSaslWithFailure();
}
+ @Override
public void receiveClose(final short channel, final Close close)
{
assertState(FrameReceivingState.ANY_FRAME);
@@ -353,10 +354,11 @@ public class AMQPConnection_1_0 extends
_connectionState = ConnectionState.CLOSE_RECEIVED;
if(close.getError() != null)
{
- ErrorCondition condition = _remoteError.getCondition();
+ final Error error = close.getError();
+ ErrorCondition condition = error.getCondition();
Symbol errorCondition = condition == null ? null :
condition.getValue();
LOGGER.info("{} : Connection closed with error : {} - {}",
getLogSubject(),
- errorCondition, _remoteError.getDescription());
+ errorCondition,
close.getError().getDescription());
}
sendClose(new Close());
_connectionState = ConnectionState.CLOSED;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
