diff options
| author | Joe George <joe@zeroc.com> | 2019-12-06 15:37:36 -0500 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2019-12-06 15:38:01 -0500 |
| commit | 7918939c711ae2a8bc853c777d6a355d46f96870 (patch) | |
| tree | a7c0b0d05bed7db8e54b7d59671be9abbb32a8b2 /cpp | |
| parent | Add missing break after locating IPEndpointInfo (diff) | |
| download | ice-7918939c711ae2a8bc853c777d6a355d46f96870.tar.bz2 ice-7918939c711ae2a8bc853c777d6a355d46f96870.tar.xz ice-7918939c711ae2a8bc853c777d6a355d46f96870.zip | |
Remove unnecessary session destruction in Glacier2 (Closes #653)
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/Glacier2/Blobject.cpp | 18 | ||||
| -rw-r--r-- | cpp/src/Glacier2/RequestQueue.cpp | 13 |
2 files changed, 0 insertions, 31 deletions
diff --git a/cpp/src/Glacier2/Blobject.cpp b/cpp/src/Glacier2/Blobject.cpp index 20a8ae2e8cc..3ee669ff860 100644 --- a/cpp/src/Glacier2/Blobject.cpp +++ b/cpp/src/Glacier2/Blobject.cpp @@ -94,24 +94,6 @@ Glacier2::Blobject::invokeSent(bool, const AMD_Object_ice_invokePtr& amdCB) void Glacier2::Blobject::invokeException(const Exception& ex, const AMD_Object_ice_invokePtr& amdCB) { - // - // If the connection has been lost, destroy the session. - // - if(_reverseConnection) - { - if(dynamic_cast<const SocketException*>(&ex) || - dynamic_cast<const TimeoutException*>(&ex) || - dynamic_cast<const ProtocolException*>(&ex)) - { - try - { - _instance->sessionRouter()->destroySession(_reverseConnection); - } - catch(const Exception&) - { - } - } - } amdCB->ice_exception(ex); } diff --git a/cpp/src/Glacier2/RequestQueue.cpp b/cpp/src/Glacier2/RequestQueue.cpp index 4fef48c3487..51dc1387289 100644 --- a/cpp/src/Glacier2/RequestQueue.cpp +++ b/cpp/src/Glacier2/RequestQueue.cpp @@ -407,19 +407,6 @@ Glacier2::RequestQueue::exception(const Ice::Exception& ex, const RequestPtr& re // if(_connection) { - if(dynamic_cast<const Ice::SocketException*>(&ex) || - dynamic_cast<const Ice::TimeoutException*>(&ex) || - dynamic_cast<const Ice::ProtocolException*>(&ex)) - { - try - { - _instance->sessionRouter()->destroySession(_connection); - } - catch(const Exception&) - { - } - } - IceUtil::Mutex::Lock lock(*this); if(request == _pendingSendRequest) { |