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/operations/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/operations/Collocated.cpp')
| -rw-r--r-- | cpp/test/Ice/operations/Collocated.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/test/Ice/operations/Collocated.cpp b/cpp/test/Ice/operations/Collocated.cpp index 840a6defa81..1bae52850c1 100644 --- a/cpp/test/Ice/operations/Collocated.cpp +++ b/cpp/test/Ice/operations/Collocated.cpp @@ -23,7 +23,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator, communicator->getProperties()->setProperty("TestAdapter.AdapterId", "test"); Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPrx prx = adapter->add(new MyDerivedClassI, communicator->stringToIdentity("test")); - adapter->activate(); + //adapter->activate(); // Don't activate OA to ensure collocation is used. test(!prx->ice_getConnection()); |