summaryrefslogtreecommitdiff
path: root/py/modules/IcePy/Proxy.cpp
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2005-01-06 00:33:14 +0000
committerMark Spruiell <mes@zeroc.com>2005-01-06 00:33:14 +0000
commit271adee5d7aafdc4cecd252d0a85ffcb772fe2da (patch)
tree148b1a9133d061cd16b7e56c6c2325956b93fa2f /py/modules/IcePy/Proxy.cpp
parentfixing an encoding bug in IceSSL (diff)
downloadice-271adee5d7aafdc4cecd252d0a85ffcb772fe2da.tar.bz2
ice-271adee5d7aafdc4cecd252d0a85ffcb772fe2da.tar.xz
ice-271adee5d7aafdc4cecd252d0a85ffcb772fe2da.zip
workaround for router proxy comparison problems
Diffstat (limited to 'py/modules/IcePy/Proxy.cpp')
-rw-r--r--py/modules/IcePy/Proxy.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/py/modules/IcePy/Proxy.cpp b/py/modules/IcePy/Proxy.cpp
index dc0ad65f20a..b10c51242e1 100644
--- a/py/modules/IcePy/Proxy.cpp
+++ b/py/modules/IcePy/Proxy.cpp
@@ -42,7 +42,13 @@ allocateProxy(const Ice::ObjectPrx& proxy, const Ice::CommunicatorPtr& communica
return NULL;
}
- p->proxy = new Ice::ObjectPrx(proxy->ice_collocationOptimization(false));
+ //
+ // Disabling collocation optimization can cause subtle problems with proxy
+ // comparison (such as in RouterInfo::get) if a proxy from IcePy is
+ // compared with a proxy from Ice/C++.
+ //
+ //p->proxy = new Ice::ObjectPrx(proxy->ice_collocationOptimization(false));
+ p->proxy = new Ice::ObjectPrx(proxy);
p->communicator = new Ice::CommunicatorPtr(communicator);
return p;