diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2008-11-12 11:22:37 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2008-11-12 11:22:37 +0100 |
| commit | a000857ff6a9ad91cc1931ce367520f66b9f5a80 (patch) | |
| tree | 877505ed78f842594814b6b627323a589ac2675b /cpp/src/slice2java/Gen.cpp | |
| parent | Fixed bug 3537 - Assertion when Ice.ThreadPool.Client thread creation fails (diff) | |
| parent | Fixed bug 3539 - SEGFAULT if thread start() fails in constructor (diff) | |
| download | ice-a000857ff6a9ad91cc1931ce367520f66b9f5a80.tar.bz2 ice-a000857ff6a9ad91cc1931ce367520f66b9f5a80.tar.xz ice-a000857ff6a9ad91cc1931ce367520f66b9f5a80.zip | |
Merge commit 'origin/R3_3_branch'
Diffstat (limited to 'cpp/src/slice2java/Gen.cpp')
| -rw-r--r-- | cpp/src/slice2java/Gen.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index e8f7145afc3..6ced7eec620 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -4270,7 +4270,7 @@ Slice::Gen::DelegateMVisitor::visitClassDefStart(const ClassDefPtr& p) out << nl << "throw new Ice.UnknownUserException(__ex.ice_name());"; out << eb; out << eb; - if(op->returnsData()) + if(ret || !outParams.empty()) { out << nl << "IceInternal.BasicStream __is = __og.is();"; out << nl << "__is.startReadEncaps();"; @@ -5150,7 +5150,7 @@ Slice::Gen::AsyncVisitor::visitOperation(const OperationPtr& p) out << nl << "throw new Ice.UnknownUserException(__ex.ice_name());"; out << eb; out << eb; - if(p->returnsData()) + if(ret || !outParams.empty()) { out << nl << "__is.startReadEncaps();"; for(pli = outParams.begin(); pli != outParams.end(); ++pli) |