diff options
| author | Mark Spruiell <mes@zeroc.com> | 2005-07-25 20:05:25 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2005-07-25 20:05:25 +0000 |
| commit | d27bf1bf1e13448ea77ee6c126ff97ea28554c72 (patch) | |
| tree | 6197030951108fb3a8f51dad0e2380227bdc5f14 /cpp | |
| parent | align UnknownUserException with C++, Java (diff) | |
| download | ice-d27bf1bf1e13448ea77ee6c126ff97ea28554c72.tar.bz2 ice-d27bf1bf1e13448ea77ee6c126ff97ea28554c72.tar.xz ice-d27bf1bf1e13448ea77ee6c126ff97ea28554c72.zip | |
UnknownUserException fixes
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/Ice/Proxy.cpp | 52 |
1 files changed, 32 insertions, 20 deletions
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index 2fb3fbd4ee1..e9b70364262 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -847,14 +847,17 @@ IceDelegateM::Ice::Object::ice_isA(const string& __id, const Context& __context) BasicStream* __is = __og.is(); if(!__ok) { - __is->throwException(); + try + { + __is->throwException(); + } + catch(const ::Ice::UserException& __ex) + { + throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_name()); + } } __is->read(__ret); } - catch(const ::Ice::UserException& __ex) - { - throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_name()); - } catch(const ::Ice::LocalException& __ex) { throw ::IceInternal::NonRepeatable(__ex); @@ -873,13 +876,16 @@ IceDelegateM::Ice::Object::ice_ping(const Context& __context) BasicStream* __is = __og.is(); if(!__ok) { - __is->throwException(); + try + { + __is->throwException(); + } + catch(const ::Ice::UserException& __ex) + { + throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_name()); + } } } - catch(const ::Ice::UserException& __ex) - { - throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_name()); - } catch(const ::Ice::LocalException& __ex) { throw ::IceInternal::NonRepeatable(__ex); @@ -898,14 +904,17 @@ IceDelegateM::Ice::Object::ice_ids(const Context& __context) BasicStream* __is = __og.is(); if(!__ok) { - __is->throwException(); + try + { + __is->throwException(); + } + catch(const ::Ice::UserException& __ex) + { + throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_name()); + } } __is->read(__ret); } - catch(const ::Ice::UserException& __ex) - { - throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_name()); - } catch(const ::Ice::LocalException& __ex) { throw ::IceInternal::NonRepeatable(__ex); @@ -925,14 +934,17 @@ IceDelegateM::Ice::Object::ice_id(const Context& __context) BasicStream* __is = __og.is(); if(!__ok) { - __is->throwException(); + try + { + __is->throwException(); + } + catch(const ::Ice::UserException& __ex) + { + throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_name()); + } } __is->read(__ret); } - catch(const ::Ice::UserException& __ex) - { - throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_name()); - } catch(const ::Ice::LocalException& __ex) { throw ::IceInternal::NonRepeatable(__ex); |