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/IncomingAsync.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/IncomingAsync.cpp')
| -rw-r--r-- | cpp/src/Ice/IncomingAsync.cpp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/cpp/src/Ice/IncomingAsync.cpp b/cpp/src/Ice/IncomingAsync.cpp index 91b9ab3eb80..b6997321a7f 100644 --- a/cpp/src/Ice/IncomingAsync.cpp +++ b/cpp/src/Ice/IncomingAsync.cpp @@ -295,13 +295,20 @@ IceAsync::Ice::AMD_Object_ice_invoke::AMD_Object_ice_invoke(Incoming& in) : } void -IceAsync::Ice::AMD_Object_ice_invoke::ice_response(bool ok, const vector<Byte>& outParams) +IceAsync::Ice::AMD_Object_ice_invoke::ice_response(bool ok, const vector<Byte>& outEncaps) { if(__validateResponse(ok)) { try { - __writeParamEncaps(&outParams[0], outParams.size(), ok); + if(outEncaps.empty()) + { + __writeParamEncaps(0, 0, ok); + } + else + { + __writeParamEncaps(&outEncaps[0], outEncaps.size(), ok); + } } catch(const LocalException& ex) { @@ -313,13 +320,13 @@ IceAsync::Ice::AMD_Object_ice_invoke::ice_response(bool ok, const vector<Byte>& } void -IceAsync::Ice::AMD_Object_ice_invoke::ice_response(bool ok, const pair<const Byte*, const Byte*>& outParams) +IceAsync::Ice::AMD_Object_ice_invoke::ice_response(bool ok, const pair<const Byte*, const Byte*>& outEncaps) { if(__validateResponse(ok)) { try { - __writeParamEncaps(outParams.first, static_cast<Int>(outParams.second - outParams.first), ok); + __writeParamEncaps(outEncaps.first, static_cast<Int>(outEncaps.second - outEncaps.first), ok); } catch(const LocalException& ex) { |