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/metrics/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/metrics/Collocated.cpp')
| -rw-r--r-- | cpp/test/Ice/metrics/Collocated.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/test/Ice/metrics/Collocated.cpp b/cpp/test/Ice/metrics/Collocated.cpp index 8b9943fe2b8..062fe3bda84 100644 --- a/cpp/test/Ice/metrics/Collocated.cpp +++ b/cpp/test/Ice/metrics/Collocated.cpp @@ -24,12 +24,12 @@ run(int, char**, const Ice::CommunicatorPtr& communicator, const CommunicatorObs Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter"); Ice::ObjectPtr object = new MetricsI; adapter->add(object, communicator->stringToIdentity("metrics")); - //adapter->activate(); + //adapter->activate(); // Don't activate OA to ensure collocation is used. communicator->getProperties()->setProperty("ControllerAdapter.Endpoints", "default -p 12011"); Ice::ObjectAdapterPtr controllerAdapter = communicator->createObjectAdapter("ControllerAdapter"); controllerAdapter->add(new ControllerI(adapter), communicator->stringToIdentity("controller")); - //controllerAdapter->activate(); + //controllerAdapter->activate(); // Don't activate OA to ensure collocation is used. MetricsPrx allTests(const Ice::CommunicatorPtr&, const CommunicatorObserverIPtr&); MetricsPrx metrics = allTests(communicator, observer); |