summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/ConnectRequestHandler.cpp
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2014-09-29 11:17:22 +0200
committerBenoit Foucher <benoit@zeroc.com>2014-09-29 11:17:22 +0200
commitdb3585813845bdd17d9ee3c7d5a4828a82e03f4b (patch)
tree660c77fde31f6656a2b76720df4f75b7eb1adbf4 /cpp/src/Ice/ConnectRequestHandler.cpp
parent- begin_ now never interrupts. (diff)
downloadice-db3585813845bdd17d9ee3c7d5a4828a82e03f4b.tar.bz2
ice-db3585813845bdd17d9ee3c7d5a4828a82e03f4b.tar.xz
ice-db3585813845bdd17d9ee3c7d5a4828a82e03f4b.zip
Improved fix for ICE-5693 and update of request handler
Diffstat (limited to 'cpp/src/Ice/ConnectRequestHandler.cpp')
-rw-r--r--cpp/src/Ice/ConnectRequestHandler.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/cpp/src/Ice/ConnectRequestHandler.cpp b/cpp/src/Ice/ConnectRequestHandler.cpp
index 7a6b495a13f..5a9a84c83b1 100644
--- a/cpp/src/Ice/ConnectRequestHandler.cpp
+++ b/cpp/src/Ice/ConnectRequestHandler.cpp
@@ -92,11 +92,10 @@ RequestHandlerPtr
ConnectRequestHandler::connect()
{
Ice::ObjectPrx proxy = _proxy;
-
- _reference->getConnection(this);
-
try
{
+ _reference->getConnection(this);
+
Lock sync(*this);
if(!initialized())
{