3 files changed, 2 insertions, 74 deletions
diff --git a/java/test/Ice/faultTolerance/AllTests.java b/java/test/Ice/faultTolerance/AllTests.java
index b39c597d329..71ea60240b1 100644
--- a/java/test/Ice/faultTolerance/AllTests.java
+++ b/java/test/Ice/faultTolerance/AllTests.java
@@ -203,36 +203,7 @@ public class AllTests
 
 	private AMI_Test_abortI delegate = new AMI_Test_abortI();
     }
-    
-    private static class AMI_Test_nonmutatingAbortI extends AMI_TestIntf_nonmutatingAbort
-    {
-	public void
-	ice_response()
-	{
-	    test(false);
-	}
-	
-	public void
-	ice_exception(Ice.LocalException ex)
-	{
-	    delegate.ice_exception(ex);
-	}
-	
-	public void
-	ice_exception(Ice.UserException ex)
-	{
-	    delegate.ice_exception(ex);
-	}
-	
-	public boolean
-	check()
-	{
-	    return delegate.check();
-	}
-
-	private AMI_Test_abortI delegate = new AMI_Test_abortI();
-    }
-    
+     
     public static void
     allTests(Ice.Communicator communicator, int[] ports)
     {
@@ -339,7 +310,7 @@ public class AllTests
 		    System.out.println("ok");
 		}
             }
-            else if(j == 2)
+            else if(j == 2 || j == 3)
             {
 		if(!ami)
 		{
@@ -375,42 +346,6 @@ public class AllTests
 
                 ++i;
             }
-            else if(j == 3)
-            {
-		if(!ami)
-		{
-		    System.out.print("aborting server #" + i + " and #" + (i + 1) + " with nonmutating call... ");
-		    System.out.flush();
-		    try
-		    {
-			obj.nonmutatingAbort();
-			test(false);
-		    }
-		    catch(Ice.ConnectionLostException ex)
-		    {
-			System.out.println("ok");
-		    }
-		    catch(Ice.ConnectFailedException exc)
-		    {
-			System.out.println("ok");
-		    }
-		    catch(Ice.SocketException ex)
-		    {
-			System.out.println("ok");
-		    }
-		}
-		else
-		{
-		    System.out.print("aborting server #" + i + " and #" + (i + 1) + " with nonmutating AMI call... ");
-		    System.out.flush();
-		    AMI_Test_nonmutatingAbortI cb = new AMI_Test_nonmutatingAbortI();
-		    obj.nonmutatingAbort_async(cb);
-		    test(cb.check());
-		    System.out.println("ok");
-		}
-
-                ++i;
-            }
             else
             {
                 assert(false);
diff --git a/java/test/Ice/faultTolerance/Test.ice b/java/test/Ice/faultTolerance/Test.ice
index b2470263e52..f07c5d508eb 100644
--- a/java/test/Ice/faultTolerance/Test.ice
+++ b/java/test/Ice/faultTolerance/Test.ice
@@ -18,7 +18,6 @@ module Test
     void shutdown();
     void abort();
     idempotent void idempotentAbort();
-    idempotent void nonmutatingAbort();
     idempotent int pid();
 };
 
diff --git a/java/test/Ice/faultTolerance/TestI.java b/java/test/Ice/faultTolerance/TestI.java
index 8a2bcd34fd6..33e4f1ff5bd 100644
--- a/java/test/Ice/faultTolerance/TestI.java
+++ b/java/test/Ice/faultTolerance/TestI.java
@@ -36,12 +36,6 @@ public final class TestI extends _TestIntfDisp
 	Runtime.getRuntime().halt(0);
     }
 
-    public void
-    nonmutatingAbort(Ice.Current current)
-    {
-	Runtime.getRuntime().halt(0);
-    }
-
     public int
     pid(Ice.Current current)
     {