diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2006-03-03 14:29:39 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2006-03-03 14:29:39 +0000 |
| commit | 8707a5575b33c8195e399abe54244e33b08b199e (patch) | |
| tree | 9ad670f5c8240f25aefe05c9c04cefa89e07ff19 /cpp/src/slice2cppe | |
| parent | Ported retry test (diff) | |
| download | ice-8707a5575b33c8195e399abe54244e33b08b199e.tar.bz2 ice-8707a5575b33c8195e399abe54244e33b08b199e.tar.xz ice-8707a5575b33c8195e399abe54244e33b08b199e.zip | |
Ported fix for bug 574
Diffstat (limited to 'cpp/src/slice2cppe')
| -rw-r--r-- | cpp/src/slice2cppe/Gen.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/slice2cppe/Gen.cpp b/cpp/src/slice2cppe/Gen.cpp index e7417ebf3b9..e332eb5d6b2 100644 --- a/cpp/src/slice2cppe/Gen.cpp +++ b/cpp/src/slice2cppe/Gen.cpp @@ -1505,7 +1505,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) C << nl << "catch(const ::Ice::LocalException& __ex)"; C << sb; - C << nl << "throw ::IceInternal::NonRepeatable(__ex);"; + C << nl << "throw ::IceInternal::LocalExceptionWrapper(__ex, false);"; C << eb; C.zeroIndent(); @@ -1523,15 +1523,15 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p) C << nl << "return;"; } C << eb; - C << nl << "catch(const ::IceInternal::NonRepeatable& __ex)"; + C << nl << "catch(const ::IceInternal::LocalExceptionWrapper& __ex)"; C << sb; if(p->mode() == Operation::Idempotent || p->mode() == Operation::Nonmutating) { - C << nl << "__handleException(*__ex.get(), __cnt);"; + C << nl << "__handleExceptionWrapperRelaxed(__ex, __cnt);"; } else { - C << nl << "__rethrowException(*__ex.get());"; + C << nl << "__handleExceptionWrapper(__ex);"; } C << eb; C << nl << "catch(const ::Ice::LocalException& __ex)"; |