diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/Incoming.cpp | 11 | ||||
| -rw-r--r-- | cpp/src/Ice/Object.cpp | 18 | ||||
| -rw-r--r-- | cpp/src/slice2cpp/Gen.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/slice2java/Gen.cpp | 2 |
4 files changed, 16 insertions, 17 deletions
diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp index 8ee0c45e08c..edb0882ea61 100644 --- a/cpp/src/Ice/Incoming.cpp +++ b/cpp/src/Ice/Incoming.cpp @@ -215,17 +215,16 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager) } // - // In case of an asynchronous dispatch, _is is now empty, - // because an IncomingAsync has adopted this Incoming. + // DispatchAsync is "pseudo dispatch status", used + // internally only to indicate async dispatch. // - if(_is.b.empty()) + if(status == DispatchAsync) { // // If this was an asynchronous dispatch, we're done - // here. We do *not* call __finishInvoke(), because the - // call is not finished yet. + // here. We do *not* call __finishInvoke(), because + // the call is not finished yet. // - assert(status == DispatchOK); return; } } diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp index 6e6330682e0..660bb636dcd 100644 --- a/cpp/src/Ice/Object.cpp +++ b/cpp/src/Ice/Object.cpp @@ -133,8 +133,8 @@ Ice::Object::___ice_ids(Incoming& __in, const Current& __current) return DispatchOK; } -::IceInternal::DispatchStatus -Ice::Object::___ice_id(::IceInternal::Incoming& __in, const Current& __current) +DispatchStatus +Ice::Object::___ice_id(Incoming& __in, const Current& __current) { BasicStream* __os = __in.os(); string __ret = ice_id(__current); @@ -142,8 +142,8 @@ Ice::Object::___ice_id(::IceInternal::Incoming& __in, const Current& __current) return DispatchOK; } -::IceInternal::DispatchStatus -Ice::Object::___ice_facets(::IceInternal::Incoming& __in, const Current& __current) +DispatchStatus +Ice::Object::___ice_facets(Incoming& __in, const Current& __current) { BasicStream* __os = __in.os(); vector<string> __ret = ice_facets(__current); @@ -201,7 +201,7 @@ Ice::Object::__dispatch(Incoming& in, const Current& current) } void -Ice::Object::__write(::IceInternal::BasicStream* __os) const +Ice::Object::__write(BasicStream* __os) const { IceUtil::Mutex::Lock sync(_activeFacetMapMutex); @@ -217,7 +217,7 @@ Ice::Object::__write(::IceInternal::BasicStream* __os) const } void -Ice::Object::__read(::IceInternal::BasicStream* __is, bool __rid) +Ice::Object::__read(BasicStream* __is, bool __rid) { IceUtil::Mutex::Lock sync(_activeFacetMapMutex); @@ -443,11 +443,11 @@ Ice::Blobject::__dispatch(Incoming& in, const Current& current) in.os()->writeBlob(outParams); if(ok) { - return ::IceInternal::DispatchOK; + return DispatchOK; } else { - return ::IceInternal::DispatchUserException; + return DispatchUserException; } } @@ -474,5 +474,5 @@ Ice::BlobjectAsync::__dispatch(Incoming& in, const Current& current) { cb->ice_exception(); } - return ::IceInternal::DispatchOK; + return DispatchAsync; } diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp index 0489018e9d9..db026b60b0f 100644 --- a/cpp/src/slice2cpp/Gen.cpp +++ b/cpp/src/slice2cpp/Gen.cpp @@ -2686,7 +2686,7 @@ Slice::Gen::ObjectVisitor::visitOperation(const OperationPtr& p) C << sb; C << nl << "__cb->ice_exception();"; C << eb; - C << nl << "return ::IceInternal::DispatchOK;"; + C << nl << "return ::IceInternal::DispatchAsync;"; } C << eb; } diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp index 139524917b2..eeb9cc8c537 100644 --- a/cpp/src/slice2java/Gen.cpp +++ b/cpp/src/slice2java/Gen.cpp @@ -664,7 +664,7 @@ Slice::JavaVisitor::writeDispatch(Output& out, const ClassDefPtr& p) out << sb; out << nl << "__cb.ice_exception(ex);"; out << eb; - out << nl << "return IceInternal.DispatchStatus.DispatchOK;"; + out << nl << "return IceInternal.DispatchStatus.DispatchAsync;"; out << eb; } |