Fix for bugs #1015 and #542 (default properties)

1 files changed, 8 insertions, 5 deletions

diff --git a/cpp/test/Ice/operations/Collocated.cpp b/cpp/test/Ice/operations/Collocated.cpp
index a8016a9f753..ca0e74e0563 100644
--- a/cpp/test/Ice/operations/Collocated.cpp
+++ b/cpp/test/Ice/operations/Collocated.cpp
@@ -13,7 +13,8 @@
 using namespace std;
 
 int
-run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
+run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator,
+    const Ice::InitializationData& initData)
 {
     communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
@@ -22,8 +23,8 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
     adapter->add(new TestCheckedCastI, communicator->stringToIdentity("context"));
     adapter->activate();
 
-    Test::MyClassPrx allTests(const Ice::CommunicatorPtr&, bool);
-    allTests(communicator, true);
+    Test::MyClassPrx allTests(const Ice::CommunicatorPtr&, const Ice::InitializationData&, bool);
+    allTests(communicator, initData, true);
 
     return EXIT_SUCCESS;
 }
@@ -36,8 +37,10 @@ main(int argc, char* argv[])
 
     try
     {
-	communicator = Ice::initialize(argc, argv);
-	status = run(argc, argv, communicator);
+	Ice::InitializationData initData;
+	initData.properties = Ice::createProperties(argc, argv);
+	communicator = Ice::initialize(argc, argv, initData);
+	status = run(argc, argv, communicator, initData);
     }
     catch(const Ice::Exception& ex)
     {