summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2001-09-18 05:10:44 +0000
committerMarc Laukien <marc@zeroc.com>2001-09-18 05:10:44 +0000
commitbd1e9039de767b18f8fecaff54265bdf8a8bfd80 (patch)
treece9d6a72ba609d5ced0d8e600be077cd4866920a /cpp
parentfixes (diff)
downloadice-bd1e9039de767b18f8fecaff54265bdf8a8bfd80.tar.bz2
ice-bd1e9039de767b18f8fecaff54265bdf8a8bfd80.tar.xz
ice-bd1e9039de767b18f8fecaff54265bdf8a8bfd80.zip
bug fix
Diffstat (limited to 'cpp')
-rw-r--r--cpp/src/Ice/Proxy.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index fabfdf7c0f2..22160f121f2 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -422,7 +422,15 @@ IceProxy::Ice::Object::__getDelegate()
else
{
_delegate = __createDelegateM();
- _delegate->setup(_reference);
+ try
+ {
+ _delegate->setup(_reference);
+ }
+ catch(...)
+ {
+ _delegate = 0;
+ throw;
+ }
}
}