diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2008-02-11 17:36:42 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2008-02-11 17:36:42 +0100 |
| commit | 2d8d90de71cb647bd49f3b8c2b93fd7ce257f54c (patch) | |
| tree | dc2c7ff7949b7cb8339ab3bebf0cfbc6575b094e /cpp/src/Ice/ConnectRequestHandler.cpp | |
| parent | Do ont use stupid in reference to M$ (diff) | |
| download | ice-2d8d90de71cb647bd49f3b8c2b93fd7ce257f54c.tar.bz2 ice-2d8d90de71cb647bd49f3b8c2b93fd7ce257f54c.tar.xz ice-2d8d90de71cb647bd49f3b8c2b93fd7ce257f54c.zip | |
Fix for bug 2677
Diffstat (limited to 'cpp/src/Ice/ConnectRequestHandler.cpp')
| -rw-r--r-- | cpp/src/Ice/ConnectRequestHandler.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/cpp/src/Ice/ConnectRequestHandler.cpp b/cpp/src/Ice/ConnectRequestHandler.cpp index c9b7a061e7c..94d22e2f11b 100644 --- a/cpp/src/Ice/ConnectRequestHandler.cpp +++ b/cpp/src/Ice/ConnectRequestHandler.cpp @@ -100,14 +100,9 @@ ConnectRequestHandler::connect() _reference->getConnection(this); Lock sync(*this); - if(_exception.get()) + if(initialized()) { - _exception->ice_throw(); - return 0; // Keep the compiler happy. - } - else if(_connection) - { - assert(_initialized); + assert(_connection); return new ConnectionRequestHandler(_reference, _connection, _compress); } else |