4 files changed, 1 insertions, 54 deletions
diff --git a/cpp/test/Ice/faultTolerance/AllTests.cpp b/cpp/test/Ice/faultTolerance/AllTests.cpp
index 3c8508541ad..2efe542995d 100644
--- a/cpp/test/Ice/faultTolerance/AllTests.cpp
+++ b/cpp/test/Ice/faultTolerance/AllTests.cpp
@@ -147,21 +147,6 @@ class AMI_Test_idempotentAbortI : public AMI_TestIntf_idempotentAbort, public AM
 
 typedef IceUtil::Handle<AMI_Test_idempotentAbortI> AMI_Test_idempotentAbortIPtr;
 
-class AMI_Test_nonmutatingAbortI : public AMI_TestIntf_nonmutatingAbort, public AMI_Test_abortI
-{
-    virtual void ice_response()
-    {
-	test(false);
-    }
-
-    virtual void ice_exception(const Ice::Exception& ex)
-    {
-	AMI_Test_abortI::ice_exception(ex);
-    }
-};
-
-typedef IceUtil::Handle<AMI_Test_nonmutatingAbortI> AMI_Test_nonmutatingAbortIPtr;
-
 void
 allTests(const Ice::CommunicatorPtr& communicator, const vector<int>& ports)
 {
@@ -257,7 +242,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const vector<int>& ports)
 		cout << "ok" << endl;
 	    }
 	}
-	else if(j == 2)
+	else if(j == 2 || j == 3)
 	{
 	    if(!ami)
 	    {
@@ -287,36 +272,6 @@ allTests(const Ice::CommunicatorPtr& communicator, const vector<int>& ports)
 
 	    ++i;
 	}
-	else if(j == 3)
-	{
-	    if(!ami)
-	    {
-		cout << "aborting server #" << i << " and #" << i + 1 << " with nonmutating call... " << flush;
-		try
-		{
-		    obj->nonmutatingAbort();
-		    test(false);
-		}
-		catch(const Ice::ConnectionLostException&)
-		{
-		    cout << "ok" << endl;
-		}
-		catch(const Ice::ConnectFailedException&)
-		{
-		    cout << "ok" << endl;
-		}
-	    }
-	    else
-	    {
-		cout << "aborting server #" << i << " and #" << i + 1 << " with nonmutating AMI call... " << flush;
-		AMI_Test_nonmutatingAbortIPtr cb = new AMI_Test_nonmutatingAbortI;
-		obj->nonmutatingAbort_async(cb);
-		test(cb->check());
-		cout << "ok" << endl;
-	    }
-
-	    ++i;
-	}
 	else
 	{
 	    assert(false);
diff --git a/cpp/test/Ice/faultTolerance/Test.ice b/cpp/test/Ice/faultTolerance/Test.ice
index 460c41d19a7..f07c5d508eb 100644
--- a/cpp/test/Ice/faultTolerance/Test.ice
+++ b/cpp/test/Ice/faultTolerance/Test.ice
@@ -18,7 +18,6 @@ module Test
     void shutdown();
     void abort();
     idempotent void idempotentAbort();
-    ["cpp:const"] idempotent void nonmutatingAbort();
     idempotent int pid();
 };
 
diff --git a/cpp/test/Ice/faultTolerance/TestI.cpp b/cpp/test/Ice/faultTolerance/TestI.cpp
index 96e3954c8b8..0e0d1f1709b 100644
--- a/cpp/test/Ice/faultTolerance/TestI.cpp
+++ b/cpp/test/Ice/faultTolerance/TestI.cpp
@@ -33,12 +33,6 @@ TestI::idempotentAbort(const Ice::Current&)
     exit(0);
 }
 
-void
-TestI::nonmutatingAbort(const Ice::Current&) const
-{
-    exit(0);
-}
-
 Ice::Int
 TestI::pid(const Ice::Current&)
 {
diff --git a/cpp/test/Ice/faultTolerance/TestI.h b/cpp/test/Ice/faultTolerance/TestI.h
index 36290da77b0..2f63b399f8f 100644
--- a/cpp/test/Ice/faultTolerance/TestI.h
+++ b/cpp/test/Ice/faultTolerance/TestI.h
@@ -21,7 +21,6 @@ public:
     virtual void shutdown(const Ice::Current&);
     virtual void abort(const Ice::Current&);
     virtual void idempotentAbort(const Ice::Current&);
-    virtual void nonmutatingAbort(const Ice::Current&) const;
     virtual Ice::Int pid(const Ice::Current&);
 
 private: