diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2013-07-04 11:20:07 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2013-07-04 11:20:07 +0200 |
| commit | 0df052034b03907de02d8eac162e84e5ba50bfd5 (patch) | |
| tree | f424142a198431b2a8981bfaebe79410ef4f5481 /cpp/src | |
| parent | Fixed ICE-5340 - FileLock jlint errors in android (diff) | |
| download | ice-0df052034b03907de02d8eac162e84e5ba50bfd5.tar.bz2 ice-0df052034b03907de02d8eac162e84e5ba50bfd5.tar.xz ice-0df052034b03907de02d8eac162e84e5ba50bfd5.zip | |
Fixed ICE-5369 - fixed asserting on AMD response if memory limit exception was raised
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/slice2cs/Gen.cpp | 3 | ||||
| -rw-r--r-- | cpp/src/slice2java/Gen.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp index 60164571d5e..31ebf05c673 100644 --- a/cpp/src/slice2cs/Gen.cpp +++ b/cpp/src/slice2cs/Gen.cpp @@ -6619,7 +6619,8 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p) _out << eb; _out << nl << "catch(Ice.LocalException ex__)"; _out << sb; - _out << nl << "ice_exception(ex__);"; + _out << nl << "exception__(ex__);"; + _out << nl << "return;"; _out << eb; } else diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index 88630bc79b5..fa2f0781a0e 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -6877,7 +6877,8 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p) out << eb; out << nl << "catch(Ice.LocalException __ex)"; out << sb; - out << nl << "ice_exception(__ex);"; + out << nl << "__exception(__ex);"; + out << nl << "return;"; out << eb; } else |