diff options
Diffstat (limited to 'cs/src/Ice/Proxy.cs')
| -rw-r--r-- | cs/src/Ice/Proxy.cs | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/cs/src/Ice/Proxy.cs b/cs/src/Ice/Proxy.cs index c815004d284..7846ddffe3a 100644 --- a/cs/src/Ice/Proxy.cs +++ b/cs/src/Ice/Proxy.cs @@ -2432,15 +2432,15 @@ namespace Ice { return _requestHandler; } - _requestHandler = createRequestHandler(); - handler = _requestHandler; + 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); } public void setRequestHandler__(IceInternal.RequestHandler previous, IceInternal.RequestHandler handler) @@ -2464,20 +2464,6 @@ namespace Ice } } - private IceInternal.RequestHandler createRequestHandler() - { - if(_reference.getCollocationOptimized()) - { - ObjectAdapter adapter = _reference.getInstance().objectAdapterFactory().findObjectAdapter(this); - if(adapter != null) - { - return new IceInternal.CollocatedRequestHandler(_reference, adapter); - } - } - - return new IceInternal.ConnectRequestHandler(_reference, this); - } - // // Only for use by IceInternal.ProxyFactory // |