1 files changed, 12 insertions, 26 deletions

diff --git a/cppe/test/IceE/operations/Twoways.cpp b/cppe/test/IceE/operations/Twoways.cpp
index 5bcd0718328..ecf6b5c15ed 100644
--- a/cppe/test/IceE/operations/Twoways.cpp
+++ b/cppe/test/IceE/operations/Twoways.cpp
@@ -645,45 +645,31 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
 	    //
 	    // Test that default context is obtained correctly from communicator.
 	    //
-	    Ice::Context dflt;
-	    dflt["a"] = "b";
-	    communicator->setDefaultContext(dflt);
-	    test(p->opContext() != dflt);
+            int argc = 0;
+            char* argv[] = { "" };
+            Ice::InitializationData initData;
+            initData.defaultContext["a"] = "b";
+            Ice::CommunicatorPtr communicator2 = Ice::initialize(argc, argv, initData);
 
-	    Test::MyClassPrx p2 = Test::MyClassPrx::uncheckedCast(p->ice_context(Ice::Context()));
-	    test(p2->opContext().empty());
-
-	    p2 = Test::MyClassPrx::uncheckedCast(p->ice_defaultContext());
-	    test(p2->opContext() == dflt);
-
-	    communicator->setDefaultContext(Ice::Context());
-	    test(!p2->opContext().empty());
-
-	    communicator->setDefaultContext(dflt);
 	    string ref = communicator->getProperties()->getPropertyWithDefault(
 		"Operations.Proxy", "test:default -p 12010 -t 10000");
 	    Test::MyClassPrx c = Test::MyClassPrx::checkedCast(communicator->stringToProxy(ref));
-	    test(c->opContext() == dflt);
+	    test(c->opContext() == initData.defaultContext);
 
-	    dflt["a"] = "c";
-	    Test::MyClassPrx c2 = Test::MyClassPrx::uncheckedCast(c->ice_context(dflt));
+	    Ice::Context ctx;
+	    ctx["a"] = "c";
+	    Test::MyClassPrx c2 = Test::MyClassPrx::uncheckedCast(c->ice_context(ctx));
 	    test(c2->opContext()["a"] == "c");
 
-	    dflt.clear();
-	    Test::MyClassPrx c3 = Test::MyClassPrx::uncheckedCast(c2->ice_context(dflt));
+	    ctx.clear();
+	    Test::MyClassPrx c3 = Test::MyClassPrx::uncheckedCast(c2->ice_context(ctx));
 	    Ice::Context tmp = c3->opContext();
 	    test(tmp.find("a") == tmp.end());
 
 	    Test::MyClassPrx c4 = Test::MyClassPrx::uncheckedCast(c2->ice_defaultContext());
 	    test(c4->opContext()["a"] == "b");
 
-	    dflt["a"] = "d";
-	    communicator->setDefaultContext(dflt);
-
-	    Test::MyClassPrx c5 = Test::MyClassPrx::uncheckedCast(c->ice_defaultContext());
-	    test(c5->opContext()["a"] == "d");
-
-	    communicator->setDefaultContext(Ice::Context());
+	    communicator2->destroy();
 	}
     }