diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/Ice/Proxy.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/IceGrid/Activator.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index bc8578a3420..8113517ca4f 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -799,7 +799,7 @@ IceProxy::Ice::Object::ice_getCachedConnection() const { return __del->__getRequestHandler()->getConnection(false); } - catch(const CollocationOptimizationException&) + catch(const LocalException&) { } } diff --git a/cpp/src/IceGrid/Activator.cpp b/cpp/src/IceGrid/Activator.cpp index 3c5cf1b5dcd..b8dcf74b241 100644 --- a/cpp/src/IceGrid/Activator.cpp +++ b/cpp/src/IceGrid/Activator.cpp @@ -573,9 +573,7 @@ Activator::activate(const string& name, if(!b) { - SyscallException ex(__FILE__, __LINE__); - ex.error = getSystemErrno(); - throw ex; + throw IceUtilInternal::lastErrorToString(); } // |