diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2014-10-01 08:39:20 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2014-10-01 08:39:20 -0230 |
| commit | ffff73a172b8de5f33c0d1d1f23d011808d601a1 (patch) | |
| tree | ea0dac9203ffdaafaf2f37d7ab635098515b31fc /java/src/Ice/ConnectionI.java | |
| parent | IceGridGUI: discovery endpoints fixes and improvements (diff) | |
| download | ice-ffff73a172b8de5f33c0d1d1f23d011808d601a1.tar.bz2 ice-ffff73a172b8de5f33c0d1d1f23d011808d601a1.tar.xz ice-ffff73a172b8de5f33c0d1d1f23d011808d601a1.zip | |
Added missing ConnectionI::setCallback fix to JS
Diffstat (limited to 'java/src/Ice/ConnectionI.java')
| -rw-r--r-- | java/src/Ice/ConnectionI.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/src/Ice/ConnectionI.java b/java/src/Ice/ConnectionI.java index 58f3f043ad4..3166420ff1c 100644 --- a/java/src/Ice/ConnectionI.java +++ b/java/src/Ice/ConnectionI.java @@ -725,7 +725,7 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne boolean closed = false; synchronized(this) { - if(_state > StateClosing) + if(_state >= StateClosed) { closed = true; } @@ -762,7 +762,7 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne _monitor.remove(this); } _monitor = _monitor.acm(timeout, close, heartbeat); - + if(_monitor.getACM().timeout <= 0) { _acmLastActivity = -1; // Disable the recording of last activity. @@ -771,7 +771,7 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne { _acmLastActivity = IceInternal.Time.currentMonotonicTimeMillis(); } - + if(_state == StateActive) { _monitor.add(this); |