diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-04-26 18:37:38 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-04-26 18:37:38 +0200 |
| commit | de59ae055c776b69a9552335f2ce9920ae1e7305 (patch) | |
| tree | 2f2b3a439650fd1a2ccd8d9fe5264f8239f7ebe8 /cpp/src/Ice/Object.cpp | |
| parent | Merge remote-tracking branch 'origin/master' into encoding11 (diff) | |
| download | ice-de59ae055c776b69a9552335f2ce9920ae1e7305.tar.bz2 ice-de59ae055c776b69a9552335f2ce9920ae1e7305.tar.xz ice-de59ae055c776b69a9552335f2ce9920ae1e7305.zip | |
Win32 fixes, C# port
Diffstat (limited to 'cpp/src/Ice/Object.cpp')
| -rw-r--r-- | cpp/src/Ice/Object.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp index f2fafa34000..562ec3aab3d 100644 --- a/cpp/src/Ice/Object.cpp +++ b/cpp/src/Ice/Object.cpp @@ -392,7 +392,14 @@ Ice::BlobjectArray::__dispatch(Incoming& in, const Current& current) inEncaps.second = inEncaps.first + sz; vector<Byte> outEncaps; bool ok = ice_invoke(inEncaps, outEncaps, current); - in.__writeParamEncaps(&outEncaps[0], outEncaps.size(), ok); + if(outEncaps.empty()) + { + in.__writeParamEncaps(0, 0, ok); + } + else + { + in.__writeParamEncaps(&outEncaps[0], outEncaps.size(), ok); + } if(ok) { return DispatchOK; |