diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-10-22 16:33:13 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-10-22 16:33:13 +0200 |
| commit | d8da15a2d803da81b76568d0c8f620f8ed26d0fa (patch) | |
| tree | f193067905624d61e0e8a3e6cd7d2498b9bf1873 /cpp/src/Ice/Proxy.cpp | |
| parent | Fixed demo dist to allow gradle build of java demos (diff) | |
| download | ice-d8da15a2d803da81b76568d0c8f620f8ed26d0fa.tar.bz2 ice-d8da15a2d803da81b76568d0c8f620f8ed26d0fa.tar.xz ice-d8da15a2d803da81b76568d0c8f620f8ed26d0fa.zip | |
Fixed ICE-3490: guarantee invocation serialization for proxies which are equal
Diffstat (limited to 'cpp/src/Ice/Proxy.cpp')
| -rw-r--r-- | cpp/src/Ice/Proxy.cpp | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index d18a38a96e5..7618ff6eeb0 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -14,9 +14,7 @@ #include <Ice/ObjectAdapterFactory.h> #include <Ice/Outgoing.h> #include <Ice/OutgoingAsync.h> -#include <Ice/ConnectRequestHandler.h> -#include <Ice/CollocatedRequestHandler.h> -#include <Ice/ConnectionRequestHandler.h> +#include <Ice/RequestHandlerFactory.h> #include <Ice/Reference.h> #include <Ice/EndpointI.h> #include <Ice/Instance.h> @@ -1626,14 +1624,14 @@ IceProxy::Ice::Object::__getRequestHandler() { return _requestHandler; } - handler = createRequestHandler(); + handler = _reference->getInstance()->requestHandlerFactory()->getRequestHandler(_reference, this); _requestHandler = handler; } else { - handler = createRequestHandler(); + handler = _reference->getInstance()->requestHandlerFactory()->getRequestHandler(_reference, this); } - return handler->connect(); + return handler->connect(this); } void @@ -1663,21 +1661,6 @@ IceProxy::Ice::Object::__newInstance() const return new Object; } -RequestHandlerPtr -IceProxy::Ice::Object::createRequestHandler() -{ - if(_reference->getCollocationOptimized()) - { - ObjectAdapterPtr adapter = _reference->getInstance()->objectAdapterFactory()->findObjectAdapter(this); - if(adapter) - { - return new ::IceInternal::CollocatedRequestHandler(_reference, adapter); - } - } - - return new ::IceInternal::ConnectRequestHandler(_reference, this); -} - void IceProxy::Ice::Object::setup(const ReferencePtr& ref) { |