Author: kwall
Date: Fri Feb 19 11:40:25 2016
New Revision: 1731225
URL: http://svn.apache.org/viewvc?rev=1731225&view=rev
Log:
QPID-7079: [Java Broker] Ensure that CON-1003 (Idle) includes connection state.
Modified:
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10.java
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java
Modified:
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10.java?rev=1731225&r1=1731224&r2=1731225&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10.java
(original)
+++
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/AMQPConnection_0_10.java
Fri Feb 19 11:40:25 2016
@@ -201,7 +201,7 @@ public class AMQPConnection_0_10 extends
@Override
public Object run()
{
-
_connection.getEventLogger().message(ConnectionMessages.IDLE_CLOSE("Current
connection state: " + _connection.getConnectionDelegate().getState(), false));
+
_connection.getEventLogger().message(ConnectionMessages.IDLE_CLOSE("Current
connection state: " + _connection.getConnectionDelegate().getState(), true));
_network.close();
return null;
}
Modified:
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java?rev=1731225&r1=1731224&r2=1731225&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java
(original)
+++
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java
Fri Feb 19 11:40:25 2016
@@ -77,7 +77,7 @@ public class ServerConnectionDelegate ex
OPEN
}
- private ConnectionState _state = ConnectionState.INIT;
+ private volatile ConnectionState _state = ConnectionState.INIT;
public ServerConnectionDelegate(Broker<?> broker, String localFQDN,
SubjectCreator subjectCreator)
Modified:
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java?rev=1731225&r1=1731224&r2=1731225&view=diff
==============================================================================
---
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java
(original)
+++
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java
Fri Feb 19 11:40:25 2016
@@ -119,7 +119,7 @@ public class AMQPConnection_0_8
private final Object _channelAddRemoveLock = new Object();
private final Map<Integer, AMQChannel> _channelMap = new
ConcurrentHashMap<>();
- private ConnectionState _state = ConnectionState.INIT;
+ private volatile ConnectionState _state = ConnectionState.INIT;
/**
* The channels that the latest call to {@link
ProtocolEngine#received(QpidByteBuffer)} applied to.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
