diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2012-11-26 10:48:38 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2012-11-26 10:48:38 +0000 |
| commit | 4d2337313732be6234a4c42a10a2fd6f60f7ba0a (patch) | |
| tree | 4949ef7c9ae9f8268eb3a796b6f534594815924d /qpid/java/common/src | |
| parent | 024a52795718a00d2c6a12da7a0d1cd1505859e6 (diff) | |
| download | qpid-python-4d2337313732be6234a4c42a10a2fd6f60f7ba0a.tar.gz | |
QPID-2796 : Addressed review comments
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1413549 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/common/src')
3 files changed, 10 insertions, 6 deletions
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java index 3bff9aa346..5ae2f1ceb2 100644 --- a/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java +++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/Connection.java @@ -229,7 +229,7 @@ public class Connection extends ConnectionInvoker addConnectionListener((ConnectionListener)secureReceiver); } - NetworkConnection network = transport.connect(settings, secureReceiver, null); + NetworkConnection network = transport.connect(settings, secureReceiver, new ConnectionActivity()); setRemoteAddress(network.getRemoteAddress()); setLocalAddress(network.getLocalAddress()); diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IdleTimeoutTicker.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IdleTimeoutTicker.java index b8a8d42c7c..54a2a360bb 100644 --- a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IdleTimeoutTicker.java +++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IdleTimeoutTicker.java @@ -43,14 +43,14 @@ class IdleTimeoutTicker implements Ticker long nextTime = -1; final long maxReadIdle = 1000l * _connection.getMaxReadIdle(); - if(maxReadIdle != 0) + if(maxReadIdle > 0) { nextTime = _transport.getLastReadTime() + maxReadIdle; } long maxWriteIdle = 1000l * _connection.getMaxWriteIdle(); - if(maxWriteIdle != 0) + if(maxWriteIdle > 0) { long writeTime = _transport.getLastWriteTime() + maxWriteIdle; if(nextTime == -1l || writeTime < nextTime) @@ -66,13 +66,13 @@ class IdleTimeoutTicker implements Ticker { // writer Idle long maxWriteIdle = 1000l * _connection.getMaxWriteIdle(); - if(maxWriteIdle != 0 && maxWriteIdle+ _transport.getLastWriteTime() <= currentTime) + if(maxWriteIdle > 0 && maxWriteIdle+ _transport.getLastWriteTime() <= currentTime) { _transport.writerIdle(); } // reader Idle final long maxReadIdle = 1000l * _connection.getMaxReadIdle(); - if(maxReadIdle != 0 && maxReadIdle+ _transport.getLastReadTime() <= currentTime) + if(maxReadIdle > 0 && maxReadIdle+ _transport.getLastReadTime() <= currentTime) { _transport.readerIdle(); diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java index 11f28a2aee..06a43e21c6 100644 --- a/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java +++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/network/io/IoReceiver.java @@ -170,7 +170,11 @@ final class IoReceiver implements Runnable, Closeable if(_ticker != null) { - final int tick = _ticker.getTimeToNextTick(currentTime); + int tick = _ticker.getTimeToNextTick(currentTime); + if(tick <= 0) + { + tick = _ticker.tick(currentTime); + } try { if(!socket.isClosed()) |