diff options
Diffstat (limited to 'qpid/java')
4 files changed, 11 insertions, 11 deletions
diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java index f94ea0d0b0..8cec751825 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/transport/NonBlockingConnection.java @@ -71,8 +71,8 @@ public class NonBlockingConnection implements NetworkConnection, ByteBufferSende private final Runnable _onTransportEncryptionAction; - private int _maxReadIdle; - private int _maxWriteIdle; + private volatile int _maxReadIdle; + private volatile int _maxWriteIdle; private Principal _principal; private boolean _principalChecked; diff --git a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ProtocolEngine_0_10.java b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ProtocolEngine_0_10.java index b448919188..dd20ff52ab 100755 --- a/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ProtocolEngine_0_10.java +++ b/qpid/java/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ProtocolEngine_0_10.java @@ -58,8 +58,8 @@ public class ProtocolEngine_0_10 extends InputHandler implements ServerProtocol private ServerConnection _connection; private long _createTime = System.currentTimeMillis(); - private long _lastReadTime = _createTime; - private long _lastWriteTime = _createTime; + private volatile long _lastReadTime = _createTime; + private volatile long _lastWriteTime = _createTime; private volatile boolean _transportBlockedForWriting; private final AtomicReference<Thread> _messageAssignmentSuspended = new AtomicReference<>(); diff --git a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java index 9a80c870d7..0a64008a69 100644 --- a/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java +++ b/qpid/java/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQProtocolEngine.java @@ -173,7 +173,7 @@ public class AMQProtocolEngine implements ServerProtocolEngine, private LogSubject _logSubject; - private long _lastIoTime; + private volatile long _lastIoTime; private long _writtenBytes; @@ -186,10 +186,10 @@ public class AMQProtocolEngine implements ServerProtocolEngine, private ByteBufferSender _sender; private volatile boolean _deferFlush; - private long _lastReceivedTime = System.currentTimeMillis(); + private volatile long _lastReceivedTime = System.currentTimeMillis(); + private volatile long _lastWriteTime = System.currentTimeMillis(); private boolean _blocking; - private AtomicLong _lastWriteTime = new AtomicLong(System.currentTimeMillis()); private final Broker<?> _broker; private final Transport _transport; @@ -557,7 +557,7 @@ public class AMQProtocolEngine implements ServerProtocolEngine, final long time = System.currentTimeMillis(); _lastIoTime = time; - _lastWriteTime.set(time); + _lastWriteTime = time; if(!_deferFlush) { @@ -1922,7 +1922,7 @@ public class AMQProtocolEngine implements ServerProtocolEngine, @Override public long getLastWriteTime() { - return _lastWriteTime.get(); + return _lastWriteTime; } public boolean isCloseWhenNoRoute() diff --git a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0_SASL.java b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0_SASL.java index 0cb83d33a7..454c3e53cf 100644 --- a/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0_SASL.java +++ b/qpid/java/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ProtocolEngine_1_0_0_SASL.java @@ -79,8 +79,8 @@ public class ProtocolEngine_1_0_0_SASL implements ServerProtocolEngine, FrameOut private long _readBytes; private long _writtenBytes; - private long _lastReadTime; - private long _lastWriteTime; + private volatile long _lastReadTime; + private volatile long _lastWriteTime; private final Broker<?> _broker; private long _createTime = System.currentTimeMillis(); private ConnectionEndpoint _endpoint; |