diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2009-03-12 11:41:53 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2009-03-12 11:41:53 +0100 |
| commit | 3f4b96ad5d1a4c6043eec5a22ae5c3e77c8d68c1 (patch) | |
| tree | 926f00845be18841a7e8f550292d4622f8bd875b /cpp/src | |
| parent | - Fixed potential assert when establishing connection for proxies with (diff) | |
| download | ice-3f4b96ad5d1a4c6043eec5a22ae5c3e77c8d68c1.tar.bz2 ice-3f4b96ad5d1a4c6043eec5a22ae5c3e77c8d68c1.tar.xz ice-3f4b96ad5d1a4c6043eec5a22ae5c3e77c8d68c1.zip | |
- Fixed bug 3853 - ice_getCachedConnection could throw
- Fixed bug 3808 - odd output from IceGrid/activation test
Diffstat (limited to 'cpp/src')
| -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(); } // |