diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2008-02-14 18:08:59 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2008-02-14 18:08:59 +0100 |
| commit | a95ccc73ef5572109532f3e94498d31df106195d (patch) | |
| tree | 0062b9c56c133da43a9c7ff5536e9d5b5dbaae89 /cpp/src/slice2java/Gen.cpp | |
| parent | Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff) | |
| download | ice-a95ccc73ef5572109532f3e94498d31df106195d.tar.bz2 ice-a95ccc73ef5572109532f3e94498d31df106195d.tar.xz ice-a95ccc73ef5572109532f3e94498d31df106195d.zip | |
- Fixed bug 2688
- Fixed bug 2674
- Changed connection validation to always use non-blocking IO (bug 1981)
- Added distribution/src/common/RELEASE_NOTES.txt
- Moved distribution/src/windows/README.DEMOS to distribution/src/common
Diffstat (limited to 'cpp/src/slice2java/Gen.cpp')
| -rw-r--r-- | cpp/src/slice2java/Gen.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index 504cd6f6e31..dd6228da4f7 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -3453,16 +3453,16 @@ Slice::Gen::HelperVisitor::visitClassDefStart(const ClassDefPtr& p) out << sb; if(op->mode() == Operation::Idempotent || op->mode() == Operation::Nonmutating) { - out << nl << "__cnt = __handleExceptionWrapperRelaxed(__delBase, __ex, __cnt);"; + out << nl << "__cnt = __handleExceptionWrapperRelaxed(__delBase, __ex, null, __cnt);"; } else { - out << nl << "__handleExceptionWrapper(__delBase, __ex);"; + out << nl << "__handleExceptionWrapper(__delBase, __ex, null);"; } out << eb; out << nl << "catch(Ice.LocalException __ex)"; out << sb; - out << nl << "__cnt = __handleException(__delBase, __ex, __cnt);"; + out << nl << "__cnt = __handleException(__delBase, __ex, null, __cnt);"; out << eb; out << eb; out << eb; |