diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2008-02-14 18:08:59 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2008-02-14 18:08:59 +0100 |
| commit | a95ccc73ef5572109532f3e94498d31df106195d (patch) | |
| tree | 0062b9c56c133da43a9c7ff5536e9d5b5dbaae89 /java/src/IceInternal/ConnectRequestHandler.java | |
| parent | Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff) | |
| download | ice-a95ccc73ef5572109532f3e94498d31df106195d.tar.bz2 ice-a95ccc73ef5572109532f3e94498d31df106195d.tar.xz ice-a95ccc73ef5572109532f3e94498d31df106195d.zip | |
- Fixed bug 2688
- Fixed bug 2674
- Changed connection validation to always use non-blocking IO (bug 1981)
- Added distribution/src/common/RELEASE_NOTES.txt
- Moved distribution/src/windows/README.DEMOS to distribution/src/common
Diffstat (limited to 'java/src/IceInternal/ConnectRequestHandler.java')
| -rw-r--r-- | java/src/IceInternal/ConnectRequestHandler.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/IceInternal/ConnectRequestHandler.java b/java/src/IceInternal/ConnectRequestHandler.java index 8144356b60a..94c3c3721d6 100644 --- a/java/src/IceInternal/ConnectRequestHandler.java +++ b/java/src/IceInternal/ConnectRequestHandler.java @@ -429,7 +429,7 @@ public class ConnectRequestHandler { synchronized(this) { - assert(_exception != null && !_requests.isEmpty()); + assert(_exception == null && !_requests.isEmpty()); _exception = ex.get(); _reference.getInstance().clientThreadPool().execute(new ThreadPoolWorkItem() { @@ -448,7 +448,7 @@ public class ConnectRequestHandler { synchronized(this) { - assert(_exception != null && !_requests.isEmpty()); + assert(_exception == null && !_requests.isEmpty()); _exception = ex; _reference.getInstance().clientThreadPool().execute(new ThreadPoolWorkItem() { |