summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ConnectRequestHandler.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/Ice/ConnectRequestHandler.cpp')
-rw-r--r--cpp/src/Ice/ConnectRequestHandler.cpp9
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