diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-06-27 10:31:41 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-06-27 10:31:41 +0200 |
| commit | a4f93259dc3494d98addf38e69b87eb557d432b3 (patch) | |
| tree | d2b78bb5cea24e33dc1b46be22dba6167e96c9ed /cpp/src/Ice/Object.cpp | |
| parent | Fix for ICE-5515 (ice_staticId on proxies) in Java, C#, Python, Ruby and PHP ... (diff) | |
| download | ice-a4f93259dc3494d98addf38e69b87eb557d432b3.tar.bz2 ice-a4f93259dc3494d98addf38e69b87eb557d432b3.tar.xz ice-a4f93259dc3494d98addf38e69b87eb557d432b3.zip | |
Better collocation optimization, fix for ICE-5489, ICE-5484
Diffstat (limited to 'cpp/src/Ice/Object.cpp')
| -rw-r--r-- | cpp/src/Ice/Object.cpp | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp index a8958a367a7..76c82dad893 100644 --- a/cpp/src/Ice/Object.cpp +++ b/cpp/src/Ice/Object.cpp @@ -11,7 +11,6 @@ #include <Ice/Incoming.h> #include <Ice/IncomingAsync.h> #include <Ice/IncomingRequest.h> -#include <Ice/Direct.h> #include <Ice/LocalException.h> #include <Ice/Stream.h> #include <Ice/SlicedData.h> @@ -193,18 +192,11 @@ Ice::Object::ice_dispatch(Request& request, const DispatchInterceptorAsyncCallba }; - if(request.isCollocated()) - { - return __collocDispatch(dynamic_cast<IceInternal::Direct&>(request)); - } - else - { - IceInternal::Incoming& in = dynamic_cast<IceInternal::IncomingRequest&>(request)._in; - - PushCb pusbCb(in, cb); - in.startOver(); // may raise ResponseSentException - return __dispatch(in, in.getCurrent()); - } + IceInternal::Incoming& in = dynamic_cast<IceInternal::IncomingRequest&>(request)._in; + + PushCb pusbCb(in, cb); + in.startOver(); // may raise ResponseSentException + return __dispatch(in, in.getCurrent()); } DispatchStatus @@ -242,12 +234,6 @@ Ice::Object::__dispatch(Incoming& in, const Current& current) throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation); } -DispatchStatus -Ice::Object::__collocDispatch(IceInternal::Direct& request) -{ - return request.run(this); -} - void Ice::Object::__write(IceInternal::BasicStream* os) const { |