diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-11-04 12:15:52 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-11-04 12:15:52 +0100 |
| commit | 2a707c77f3342955869b98565f4abd8051a1f45a (patch) | |
| tree | 55e1d24b31eac51ea2c4fdc4885f66385c058dc4 /cpp/test/Ice/proxy/Collocated.cpp | |
| parent | ICE-5811 - Minor fix for Java demo distribution build (diff) | |
| download | ice-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 'cpp/test/Ice/proxy/Collocated.cpp')
| -rw-r--r-- | cpp/test/Ice/proxy/Collocated.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/test/Ice/proxy/Collocated.cpp b/cpp/test/Ice/proxy/Collocated.cpp index 6c5465cff47..a5fafa0ed7f 100644 --- a/cpp/test/Ice/proxy/Collocated.cpp +++ b/cpp/test/Ice/proxy/Collocated.cpp @@ -22,7 +22,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator, communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); adapter->add(new MyDerivedClassI, communicator->stringToIdentity("test")); - adapter->activate(); + //adapter->activate(); // Don't activate OA to ensure collocation is used. Test::MyClassPrx allTests(const Ice::CommunicatorPtr&); allTests(communicator); |