diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-10-05 17:26:44 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-10-05 17:26:44 +0200 |
| commit | 44c8fc867ecb65daeddc5aa121ccb4baad16007d (patch) | |
| tree | d778cff1613749c372f612927c0d02086a68ee0a /java/src/Ice/ConnectionI.java | |
| parent | Update IceGridGUI requirements in java/README (diff) | |
| download | ice-44c8fc867ecb65daeddc5aa121ccb4baad16007d.tar.bz2 ice-44c8fc867ecb65daeddc5aa121ccb4baad16007d.tar.xz ice-44c8fc867ecb65daeddc5aa121ccb4baad16007d.zip | |
Fixed property validations, added C# metrics test
Diffstat (limited to 'java/src/Ice/ConnectionI.java')
| -rw-r--r-- | java/src/Ice/ConnectionI.java | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/java/src/Ice/ConnectionI.java b/java/src/Ice/ConnectionI.java index 8e0c99e9761..8d7ab93f035 100644 --- a/java/src/Ice/ConnectionI.java +++ b/java/src/Ice/ConnectionI.java @@ -265,6 +265,8 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne if(_observer != null) { _observer.attach(); + _writeStreamPos = -1; + _readStreamPos = -1; } } @@ -1842,6 +1844,8 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne if(_observer != null) { _observer.attach(); + _writeStreamPos = -1; + _readStreamPos = -1; } } if(_observer != null && state == StateClosed && _exception != null) @@ -2606,7 +2610,7 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne private void observerStartRead(int pos) { - if(_readStreamPos > 0) + if(_readStreamPos >= 0) { _observer.receivedBytes(pos - _readStreamPos); } @@ -2618,13 +2622,13 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne { assert(pos >= _readStreamPos); _observer.receivedBytes(pos - _readStreamPos); - _readStreamPos = 0; + _readStreamPos = -1; } private void observerStartWrite(int pos) { - if(_writeStreamPos > 0) + if(_writeStreamPos >= 0) { _observer.sentBytes(pos - _writeStreamPos); } @@ -2636,7 +2640,7 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne { assert(pos >= _writeStreamPos); _observer.sentBytes(pos - _writeStreamPos); - _writeStreamPos = 0; + _writeStreamPos = -1; } private IceInternal.Incoming |