summaryrefslogtreecommitdiff
path: root/py/test/Ice/servantLocator/Collocated.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2014-11-04 12:15:52 +0100
committerBenoit Foucher <benoit@zeroc.com>2014-11-04 12:15:52 +0100
commit2a707c77f3342955869b98565f4abd8051a1f45a (patch)
tree55e1d24b31eac51ea2c4fdc4885f66385c058dc4 /py/test/Ice/servantLocator/Collocated.py
parentICE-5811 - Minor fix for Java demo distribution build (diff)
downloadice-2a707c77f3342955869b98565f4abd8051a1f45a.tar.bz2
ice-2a707c77f3342955869b98565f4abd8051a1f45a.tar.xz
ice-2a707c77f3342955869b98565f4abd8051a1f45a.zip
Fixed ICE-5819: added comments and fixed some tests to work with deactivated OA
Diffstat (limited to 'py/test/Ice/servantLocator/Collocated.py')
-rwxr-xr-xpy/test/Ice/servantLocator/Collocated.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/py/test/Ice/servantLocator/Collocated.py b/py/test/Ice/servantLocator/Collocated.py
index 36760436524..6efabd7ae8b 100755
--- a/py/test/Ice/servantLocator/Collocated.py
+++ b/py/test/Ice/servantLocator/Collocated.py
@@ -20,7 +20,7 @@ class TestServer(Ice.Application):
self.communicator().getProperties().setProperty("Ice.Warn.Dispatch", "0")
adapter = self.communicator().createObjectAdapter("TestAdapter")
- adapter.activate()
+ #adapter.activate() // Don't activate OA to ensure collocation is used.
adapter.addServantLocator(TestI.ServantLocatorI("category"), "category")
adapter.addServantLocator(TestI.ServantLocatorI(""), "")
adapter.add(TestI.TestI(), self.communicator().stringToIdentity("asm"))