diff options
| author | Keith Wall <kwall@apache.org> | 2014-12-08 17:01:57 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2014-12-08 17:01:57 +0000 |
| commit | d73645fe7be57f2eae7889f42f6858b13c5573af (patch) | |
| tree | 96e521c0eb203a97182cf367b5fc74dc781accea /qpid/java/broker-plugins | |
| parent | 5c48af8564229bb56f45bb47b015be325b8855da (diff) | |
| download | qpid-python-d73645fe7be57f2eae7889f42f6858b13c5573af.tar.gz | |
NonBlockingSenderReceiver for the Java Broker for AMQP-0-10 and 0-9. Heartbeating working.
AMQ 1.0 not tested.
System tests failing at about ~PriorityQueueTest with seeming resource leak.
git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/QPID-6262-JavaBrokerNIO@1643866 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins')
2 files changed, 3 insertions, 3 deletions
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 670acc4709..9ea249bd47 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 @@ -52,8 +52,8 @@ public class ProtocolEngine_0_10 extends InputHandler implements ServerProtocol private ServerConnection _connection; private long _createTime = System.currentTimeMillis(); - private long _lastReadTime; - private long _lastWriteTime; + private long _lastReadTime = _createTime; + private long _lastWriteTime = _createTime; public ProtocolEngine_0_10(ServerConnection conn, NetworkConnection network) 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 169b269629..57ab22ad27 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 @@ -170,7 +170,7 @@ public class AMQProtocolEngine implements ServerProtocolEngine, private Sender<ByteBuffer> _sender; private volatile boolean _deferFlush; - private long _lastReceivedTime; + private long _lastReceivedTime = System.currentTimeMillis(); // TODO consider if this is what we want? private boolean _blocking; private final ReentrantLock _receivedLock; |