diff options
Diffstat (limited to 'cpp/src/Ice/ConnectionI.cpp')
| -rw-r--r-- | cpp/src/Ice/ConnectionI.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp index 7082d4aed1e..0e3bf717d02 100644 --- a/cpp/src/Ice/ConnectionI.cpp +++ b/cpp/src/Ice/ConnectionI.cpp @@ -1287,7 +1287,7 @@ Ice::ConnectionI::finished(const ThreadPoolPtr& threadPool) threadPool->promoteFollower(); - auto_ptr<LocalException> exception; + auto_ptr<LocalException> localEx; map<Int, Outgoing*> requests; map<Int, AsyncRequest> asyncRequests; @@ -1313,7 +1313,7 @@ Ice::ConnectionI::finished(const ThreadPoolPtr& threadPool) } catch(const LocalException& ex) { - exception.reset(dynamic_cast<LocalException*>(ex.ice_clone())); + localEx.reset(dynamic_cast<LocalException*>(ex.ice_clone())); } _transceiver = 0; @@ -1340,9 +1340,9 @@ Ice::ConnectionI::finished(const ThreadPoolPtr& threadPool) q->second.p->__finished(*_exception.get()); // The exception is immutable at this point. } - if(exception.get()) + if(localEx.get()) { - exception->ice_throw(); + localEx->ice_throw(); } } @@ -2459,7 +2459,7 @@ Ice::ConnectionI::run() ObjectAdapterPtr adapter; OutgoingAsyncPtr outAsync; - auto_ptr<LocalException> exception; + auto_ptr<LocalException> localEx; map<Int, Outgoing*> requests; map<Int, AsyncRequest> asyncRequests; @@ -2495,7 +2495,7 @@ Ice::ConnectionI::run() } catch(const LocalException& ex) { - exception.reset(dynamic_cast<LocalException*>(ex.ice_clone())); + localEx.reset(dynamic_cast<LocalException*>(ex.ice_clone())); } _transceiver = 0; @@ -2545,10 +2545,10 @@ Ice::ConnectionI::run() q->second.p->__finished(*_exception.get()); // The exception is immutable at this point. } - if(exception.get()) + if(localEx.get()) { assert(closed); - exception->ice_throw(); + localEx->ice_throw(); } } } |