Fixed bug 815

1 files changed, 1 insertions, 13 deletions

diff --git a/cppe/test/IceE/operations/Twoways.cpp b/cppe/test/IceE/operations/Twoways.cpp
index efd5d5bd22b..d5d780131d2 100644
--- a/cppe/test/IceE/operations/Twoways.cpp
+++ b/cppe/test/IceE/operations/Twoways.cpp
@@ -682,19 +682,7 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
 	    Test::MyClassPrx c5 = Test::MyClassPrx::uncheckedCast(c->ice_defaultContext());
 	    test(c5->opContext()["a"] == "d");
 
-	    //
-	    // TODO: The succeeds with the line below commented out, even though it should
-	    // fail. What is going on is that the last setDefaultContext call leaves a
-	    // context with an entry <"a", "d">. In Alltests.cpp, we call twoways() (this
-	    // function) a second time, on a derived proxy. Above, the structure test (line 164)
-	    // calls an operation that returns a proxy. Because the default context
-	    // is still <"a", "d">, that returned proxy should get that default context.
-	    // However, it doesn't.
-	    //
-	    // If you comment out the setDefaultContext call below in Java or C# and run
-	    // the tests, you see the failure that should be caused here, but isn't.
-
-	    //communicator->setDefaultContext(Ice::Context());
+	    communicator->setDefaultContext(Ice::Context());
 	}
     }
 }