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/slice2java/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/slice2java/Gen.cpp')
| -rw-r--r-- | cpp/src/slice2java/Gen.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index 648dd82c3b8..bbee749c47f 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -242,7 +242,7 @@ Slice::JavaVisitor::writeDelegateThrowsClause(const string& package, const Excep out.inc(); out << nl << "throws "; out.useCurrentPosAsIndent(); - out << "IceInternal.NonRepeatable"; + out << "IceInternal.LocalExceptionWrapper"; ExceptionList::const_iterator r; for(r = throws.begin(); r != throws.end(); ++r) @@ -3090,15 +3090,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)"; @@ -3893,7 +3893,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"; @@ -4003,7 +4003,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 << eb; out << nl << "finally"; |