diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2006-03-14 12:47:12 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2006-03-14 12:47:12 +0000 |
| commit | 4ec329c60555de5562c72df0e2fc583d591bf84d (patch) | |
| tree | 86eb4af9aac33fc6277bed19d8936c4ffdbcd2d5 /cpp/src/slice2cs/Gen.cpp | |
| parent | Fixed http://www.zeroc.com/vbulletin/showthread.php?p=9533#post9533 (diff) | |
| download | ice-4ec329c60555de5562c72df0e2fc583d591bf84d.tar.bz2 ice-4ec329c60555de5562c72df0e2fc583d591bf84d.tar.xz ice-4ec329c60555de5562c72df0e2fc583d591bf84d.zip | |
Ported fix for bug 574.
Diffstat (limited to 'cpp/src/slice2cs/Gen.cpp')
| -rwxr-xr-x | cpp/src/slice2cs/Gen.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp index 753070d6296..87d9abb29ed 100755 --- a/cpp/src/slice2cs/Gen.cpp +++ b/cpp/src/slice2cs/Gen.cpp @@ -3349,15 +3349,15 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p) _out << nl << "return;"; } _out << eb; - _out << nl << "catch(IceInternal.NonRepeatable ex__)"; + _out << nl << "catch(IceInternal.LocalExceptionWrapper ex__)"; _out << sb; if(op->mode() == Operation::Idempotent || op->mode() == Operation::Nonmutating) { - _out << nl << "cnt__ = handleException__(ex__.get(), cnt__);"; + _out << nl << "cnt__ = handleExceptionWrapperRelaxed__(ex__, cnt__);"; } else { - _out << nl << "rethrowException__(ex__.get());"; + _out << nl << "handleExceptionWrapper__(ex__);"; } _out << eb; _out << nl << "catch(Ice.LocalException ex__)"; @@ -4020,7 +4020,7 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p) _out << eb; _out << nl << "catch(Ice.LocalException ex__)"; _out << sb; - _out << nl << "throw new IceInternal.NonRepeatable(ex__);"; + _out << nl << "throw new IceInternal.LocalExceptionWrapper(ex__, false);"; _out << eb; _out << eb; _out << nl << "finally"; @@ -4125,7 +4125,7 @@ Slice::Gen::DelegateDVisitor::visitClassDefStart(const ClassDefPtr& p) _out << eb; _out << nl << "catch(Ice.LocalException ex__)"; _out << sb; - _out << nl << "throw new IceInternal.NonRepeatable(ex__);"; + _out << nl << "throw new IceInternal.LocalExceptionWrapper(ex__, false);"; _out << eb; _out << nl << "finally"; _out << sb; |