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/slice2vb/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/slice2vb/Gen.cpp')
| -rwxr-xr-x | cpp/src/slice2vb/Gen.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/slice2vb/Gen.cpp b/cpp/src/slice2vb/Gen.cpp index e9007cb2130..280cb8ab97d 100755 --- a/cpp/src/slice2vb/Gen.cpp +++ b/cpp/src/slice2vb/Gen.cpp @@ -3691,15 +3691,15 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p) _out << nl << "Return"; } _out.dec(); - _out << nl << "Catch ex__ As IceInternal.NonRepeatable"; + _out << nl << "Catch ex__ As IceInternal.LocalExceptionWrapper"; _out.inc(); 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.dec(); _out << nl << "Catch ex__ As Ice.LocalException"; @@ -4464,7 +4464,7 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p) _out.dec(); _out << nl << "Catch ex__ As Ice.LocalException"; _out.inc(); - _out << nl << "throw New IceInternal.NonRepeatable(ex__)"; + _out << nl << "throw New IceInternal.LocalExceptionWrapper(ex__, false)"; _out.dec(); _out << nl << "End Try"; _out.dec(); @@ -4583,7 +4583,7 @@ Slice::Gen::DelegateDVisitor::visitClassDefStart(const ClassDefPtr& p) _out.dec(); _out << nl << "Catch ex__ As Ice.LocalException"; _out.inc(); - _out << nl << "Throw New IceInternal.NonRepeatable(ex__)"; + _out << nl << "Throw New IceInternal.LocalExceptionWrapper(ex__, false)"; _out.dec(); _out << nl << "Finally"; _out.inc(); |