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

1 files changed, 14 insertions, 10 deletions

diff --git a/cpp/test/Ice/operations/Client.cpp b/cpp/test/Ice/operations/Client.cpp
index 54e2ed2c9ae..6669a1f041a 100644
--- a/cpp/test/Ice/operations/Client.cpp
+++ b/cpp/test/Ice/operations/Client.cpp
@@ -14,10 +14,13 @@
 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)
 {
-    Test::MyClassPrx allTests(const Ice::CommunicatorPtr&, bool);
-    Test::MyClassPrx myClass = allTests(communicator, false);
+    Test::MyClassPrx allTests(const Ice::CommunicatorPtr&, 
+			      const Ice::InitializationData&, bool);
+    Test::MyClassPrx myClass = allTests(communicator, initData, false);
 
     cout << "testing server shutdown... " << flush;
     myClass->shutdown();
@@ -46,24 +49,25 @@ main(int argc, char* argv[])
 	// In this test, we need at least two threads in the
 	// client side thread pool for nested AMI.
 	//
-	Ice::PropertiesPtr properties = Ice::getDefaultProperties(argc, argv);
-	properties->setProperty("Ice.ThreadPool.Client.Size", "2");
-	properties->setProperty("Ice.ThreadPool.Client.SizeWarn", "0");
+	Ice::InitializationData initData;
+	initData.properties = Ice::createProperties(argc, argv);
+	initData.properties->setProperty("Ice.ThreadPool.Client.Size", "2");
+	initData.properties->setProperty("Ice.ThreadPool.Client.SizeWarn", "0");
 
 	//
 	// We must set MessageSizeMax to an explicit values, because
 	// we run tests to check whether Ice.MemoryLimitException is
 	// raised as expected.
 	//
-	properties->setProperty("Ice.MessageSizeMax", "100");
+	initData.properties->setProperty("Ice.MessageSizeMax", "100");
 
 	//
 	// We don't want connection warnings because of the timeout test.
 	//
-	properties->setProperty("Ice.Warn.Connections", "0");
+	initData.properties->setProperty("Ice.Warn.Connections", "0");
 
-	communicator = Ice::initialize(argc, argv);
-	status = run(argc, argv, communicator);
+	communicator = Ice::initialize(argc, argv, initData);
+	status = run(argc, argv, communicator, initData);
     }
     catch(const Ice::Exception& ex)
     {