4 files changed, 1 insertions, 28 deletions
diff --git a/cppe/test/IceE/faultTolerance/AllTests.cpp b/cppe/test/IceE/faultTolerance/AllTests.cpp
index ecb84a5e1e1..eb2b4e61db0 100644
--- a/cppe/test/IceE/faultTolerance/AllTests.cpp
+++ b/cppe/test/IceE/faultTolerance/AllTests.cpp
@@ -116,7 +116,7 @@ allTests(const Ice::CommunicatorPtr& communicator, const vector<int>& ports)
 	        tprintf("ok\n");
 	    }
 	}
-	else if(j == 2)
+	else if(j == 2 || j == 3)
 	{
 	    tprintf("aborting server #%d and #%d with idempotent call...", i, i + 1);
 	    try
@@ -135,25 +135,6 @@ allTests(const Ice::CommunicatorPtr& communicator, const vector<int>& ports)
 
 	    ++i;
 	}
-	else if(j == 3)
-	{
-	    tprintf("aborting server #%d and #%d with nonmutating call...", i, i + 1);
-	    try
-	    {
-	        obj->nonmutatingAbort();
-	        test(false);
-	    }
-	    catch(const Ice::ConnectionLostException&)
-	    {
-	        tprintf("ok\n");
-	    }
-	    catch(const Ice::ConnectFailedException&)
-	    {
-	        tprintf("ok\n");
-	    }
-
-	    ++i;
-	}
 	else
 	{
 	    assert(false);
diff --git a/cppe/test/IceE/faultTolerance/Test.ice b/cppe/test/IceE/faultTolerance/Test.ice
index 966cfb69069..23c49655e50 100644
--- a/cppe/test/IceE/faultTolerance/Test.ice
+++ b/cppe/test/IceE/faultTolerance/Test.ice
@@ -18,7 +18,6 @@ interface TestIntf
     void shutdown();
     void abort();
     idempotent void idempotentAbort();
-    ["cpp:const"] idempotent void nonmutatingAbort();
     idempotent int pid();
 };
 
diff --git a/cppe/test/IceE/faultTolerance/TestI.cpp b/cppe/test/IceE/faultTolerance/TestI.cpp
index f7160115e94..d55de476da7 100644
--- a/cppe/test/IceE/faultTolerance/TestI.cpp
+++ b/cppe/test/IceE/faultTolerance/TestI.cpp
@@ -34,12 +34,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/cppe/test/IceE/faultTolerance/TestI.h b/cppe/test/IceE/faultTolerance/TestI.h
index 68742fd2dd1..ef884613782 100644
--- a/cppe/test/IceE/faultTolerance/TestI.h
+++ b/cppe/test/IceE/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: