diff options
| author | Jose <jose@zeroc.com> | 2016-01-13 20:52:26 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-01-13 20:52:26 +0100 |
| commit | 739552c53337b584a62c59d9093de79ea653100e (patch) | |
| tree | 5a9751e90376e80b135d2518e5fe9c5f00910ced /cpp/src/Ice/ConnectRequestHandler.cpp | |
| parent | C++11 ice_invoke std::future API (diff) | |
| download | ice-739552c53337b584a62c59d9093de79ea653100e.tar.bz2 ice-739552c53337b584a62c59d9093de79ea653100e.tar.xz ice-739552c53337b584a62c59d9093de79ea653100e.zip | |
Minor fix related to exception ice_clone updates
Diffstat (limited to 'cpp/src/Ice/ConnectRequestHandler.cpp')
| -rw-r--r-- | cpp/src/Ice/ConnectRequestHandler.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/cpp/src/Ice/ConnectRequestHandler.cpp b/cpp/src/Ice/ConnectRequestHandler.cpp index 8bc759f07bb..ba4dec506d5 100644 --- a/cpp/src/Ice/ConnectRequestHandler.cpp +++ b/cpp/src/Ice/ConnectRequestHandler.cpp @@ -226,11 +226,8 @@ ConnectRequestHandler::setException(const Ice::LocalException& ex) { Lock sync(*this); assert(!_initialized && !ICE_EXCEPTION_GET(_exception)); -#ifdef ICE_CPP11_MAPPING - _exception = ex.ice_clone(); -#else - _exception.reset(ex.ice_clone()); -#endif + ICE_RESET_EXCEPTION(_exception, ex.ice_clone()); + _proxies.clear(); _proxy = 0; // Break cyclic reference count. |