diff options
Diffstat (limited to 'cpp')
| -rwxr-xr-x | cpp/src/slice2cs/Gen.cpp | 12 | ||||
| -rwxr-xr-x | cpp/src/slice2vb/Gen.cpp | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp index edd6654a382..518cdb54f4a 100755 --- a/cpp/src/slice2cs/Gen.cpp +++ b/cpp/src/slice2cs/Gen.cpp @@ -3981,9 +3981,9 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p) _out << nl << "throw;"; _out << eb; } - _out << nl << "catch(Ice.UserException)"; + _out << nl << "catch(Ice.UserException ex)"; _out << sb; - _out << nl << "throw new Ice.UnknownUserException();"; + _out << nl << "throw new Ice.UnknownUserException(ex);"; _out << eb; _out << eb; for(q = outParams.begin(); q != outParams.end(); ++q) @@ -4425,14 +4425,14 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p) _out << eb; for(ExceptionList::const_iterator r = throws.begin(); r != throws.end(); ++r) { - _out << nl << "catch(" << fixId((*r)->scoped()) << " ex__)"; + _out << nl << "catch(" << fixId((*r)->scoped()) << ')'; _out << sb; - _out << nl << "throw ex__;"; + _out << nl << "throw;"; _out << eb; } - _out << nl << "catch(Ice.UserException)"; + _out << nl << "catch(Ice.UserException ex)"; _out << sb; - _out << nl << "throw new Ice.UnknownUserException();"; + _out << nl << "throw new Ice.UnknownUserException(ex);"; _out << eb; _out << eb; for(q = outParams.begin(); q != outParams.end(); ++q) diff --git a/cpp/src/slice2vb/Gen.cpp b/cpp/src/slice2vb/Gen.cpp index 1a588c41a92..84a3c1b26aa 100755 --- a/cpp/src/slice2vb/Gen.cpp +++ b/cpp/src/slice2vb/Gen.cpp @@ -4458,7 +4458,7 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p) } _out << nl << "Catch ex__ As Ice.UserException"; _out.inc(); - _out << nl << "Throw New Ice.UnknownUserException()"; + _out << nl << "Throw New Ice.UnknownUserException(ex__)"; _out.dec(); _out << nl << "End Try"; _out.dec(); @@ -4946,12 +4946,12 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p) { _out << nl << "Catch ex__ As " << fixId((*r)->scoped()); _out.inc(); - _out << nl << "Throw ex__"; + _out << nl << "Throw"; _out.dec(); } _out << nl << "Catch ex__ As Ice.UserException"; _out.inc(); - _out << nl << "Throw New Ice.UnknownUserException()"; + _out << nl << "Throw New Ice.UnknownUserException(ex__)"; _out.dec(); _out << nl << "End Try"; _out.dec(); |