Removed nonmutating

20 files changed, 7 insertions, 280 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:
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:
diff --git a/cs/test/Ice/faultTolerance/AllTests.cs b/cs/test/Ice/faultTolerance/AllTests.cs
index 918c52d77d5..421f0f9e271 100755
--- a/cs/test/Ice/faultTolerance/AllTests.cs
+++ b/cs/test/Ice/faultTolerance/AllTests.cs
@@ -166,26 +166,6 @@ public class AllTests
 	private AMI_Test_abortI @delegate = new AMI_Test_abortI();
     }
     
-    private class AMI_Test_nonmutatingAbortI : AMI_TestIntf_nonmutatingAbort
-    {
-	public override void ice_response()
-	{
-	    test(false);
-	}
-	
-	public override void ice_exception(Ice.Exception ex)
-	{
-	    @delegate.ice_exception(ex);
-	}
-	
-	public bool check()
-	{
-	    return @delegate.check();
-	}
-
-	private AMI_Test_abortI @delegate = new AMI_Test_abortI();
-    }
-    
     public static void allTests(Ice.Communicator communicator, System.Collections.ArrayList ports)
     {
         Console.Out.Write("testing stringToProxy... ");
@@ -290,7 +270,7 @@ public class AllTests
 		    Console.Out.WriteLine("ok");
 		}
             }
-            else if(j == 2)
+            else if(j == 2 || j == 3)
             {
 	        if(!ami)
 		{
@@ -325,41 +305,6 @@ public class AllTests
 		}
                 ++i;
             }
-            else if(j == 3)
-            {
-	        if(!ami)
-		{
-		    Console.Out.Write("aborting server #" + i + " and #" + (i + 1) + " with nonmutating call... ");
-		    Console.Out.Flush();
-		    try
-		    {
-			obj.nonmutatingAbort();
-			test(false);
-		    }
-		    catch(Ice.ConnectionLostException)
-		    {
-			Console.Out.WriteLine("ok");
-		    }
-		    catch(Ice.ConnectFailedException)
-		    {
-			Console.Out.WriteLine("ok");
-		    }
-		    catch(Ice.SocketException)
-		    {
-			Console.Out.WriteLine("ok");
-		    }
-		}
-		else
-		{
-		    Console.Out.Write("aborting server #" + i + " and #" + (i + 1) + " with nonmutating AMI call... ");
-		    Console.Out.Flush();
-		    AMI_Test_nonmutatingAbortI cb = new AMI_Test_nonmutatingAbortI();
-		    obj.nonmutatingAbort_async(cb);
-		    test(cb.check());
-		    Console.Out.WriteLine("ok");
-		}
-                ++i;
-            }
             else
             {
                 Debug.Assert(false);
diff --git a/cs/test/Ice/faultTolerance/Test.ice b/cs/test/Ice/faultTolerance/Test.ice
index 3c373413871..ce08c149737 100755
--- a/cs/test/Ice/faultTolerance/Test.ice
+++ b/cs/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/cs/test/Ice/faultTolerance/TestI.cs b/cs/test/Ice/faultTolerance/TestI.cs
index acce0a1c1bd..7d6ab9d6e7b 100755
--- a/cs/test/Ice/faultTolerance/TestI.cs
+++ b/cs/test/Ice/faultTolerance/TestI.cs
@@ -41,11 +41,6 @@ public sealed class TestI : TestIntfDisp_
 	commitSuicide();
     }
     
-    public override void nonmutatingAbort(Ice.Current current)
-    {
-	commitSuicide();
-    }
-    
     public override int pid(Ice.Current current)
     {
 	lock(this)
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)
     {
diff --git a/javae/test/IceE/faultTolerance/AllTests.java b/javae/test/IceE/faultTolerance/AllTests.java
index 29253efee8a..09233f96a74 100644
--- a/javae/test/IceE/faultTolerance/AllTests.java
+++ b/javae/test/IceE/faultTolerance/AllTests.java
@@ -132,7 +132,7 @@ public class AllTests
 		    out.println("ok");
 		}
             }
-            else if(j == 2)
+            else if(j == 2 || j == 3)
             {
 		out.print("aborting server #" + i + " and #" + (i + 1) + " with idempotent call... ");
 		out.flush();
@@ -156,30 +156,6 @@ public class AllTests
 
                 ++i;
             }
-            else if(j == 3)
-            {
-		out.print("aborting server #" + i + " and #" + (i + 1) + " with nonmutating call... ");
-		out.flush();
-		try
-		{
-		    obj.nonmutatingAbort();
-		    test(false);
-		}
-		catch(Ice.ConnectionLostException ex)
-		{
-		    out.println("ok");
-		}
-		catch(Ice.ConnectFailedException exc)
-		{
-		    out.println("ok");
-		}
-		catch(Ice.SocketException ex)
-		{
-		    out.println("ok");
-		}
-
-                ++i;
-            }
             else
             {
                 IceUtil.Debug.Assert(false);
diff --git a/javae/test/IceE/faultTolerance/Test.ice b/javae/test/IceE/faultTolerance/Test.ice
index 692b94c273c..23c49655e50 100644
--- a/javae/test/IceE/faultTolerance/Test.ice
+++ b/javae/test/IceE/faultTolerance/Test.ice
@@ -18,7 +18,6 @@ interface TestIntf
     void shutdown();
     void abort();
     idempotent void idempotentAbort();
-    idempotent void nonmutatingAbort();
     idempotent int pid();
 };
 
diff --git a/javae/test/IceE/faultTolerance/TestI.java b/javae/test/IceE/faultTolerance/TestI.java
index 0a552326cc9..9951c92d49c 100644
--- a/javae/test/IceE/faultTolerance/TestI.java
+++ b/javae/test/IceE/faultTolerance/TestI.java
@@ -36,12 +36,6 @@ public final class TestI extends _TestIntfDisp
 	System.exit(1);
     }
 
-    public void
-    nonmutatingAbort(Ice.Current current)
-    {
-	System.exit(1);
-    }
-
     public int
     pid(Ice.Current current)
     {
diff --git a/py/test/Ice/faultTolerance/AllTests.py b/py/test/Ice/faultTolerance/AllTests.py
index 8a60442f919..700740a2195 100644
--- a/py/test/Ice/faultTolerance/AllTests.py
+++ b/py/test/Ice/faultTolerance/AllTests.py
@@ -82,13 +82,6 @@ class AMI_Test_idempotentAbortI(AMI_Test_abortI):
     def ice_exception(self, ex):
         AMI_Test_abortI.ice_exception(self, ex)
 
-class AMI_Test_nonmutatingAbortI(AMI_Test_abortI):
-    def ice_response(self):
-        test(False)
-
-    def ice_exception(self, ex):
-        AMI_Test_abortI.ice_exception(self, ex)
-
 def allTests(communicator, ports):
     print "testing stringToProxy... ",
     ref = "test"
@@ -156,7 +149,7 @@ def allTests(communicator, ports):
                 obj.abort_async(cb)
                 test(cb.check())
                 print "ok"
-        elif j == 2:
+        elif j == 2 or j == 3:
             if not ami:
                 print "aborting server #%d and #%d with idempotent call... " % (i, i + 1),
                 try:
@@ -174,24 +167,6 @@ def allTests(communicator, ports):
                 print "ok"
 
             i = i + 1
-        elif j == 3:
-            if not ami:
-                print "aborting server #%d and #%d with nonmutating call... " % (i, i + 1),
-                try:
-                    obj.nonmutatingAbort()
-                    test(False)
-                except Ice.ConnectionLostException:
-                    print "ok"
-                except Ice.ConnectFailedException:
-                    print "ok"
-            else:
-                print "aborting server #%d and #%d with nonmutating AMI call... " % (i, i + 1),
-                cb = AMI_Test_nonmutatingAbortI()
-                obj.nonmutatingAbort_async(cb)
-                test(cb.check())
-                print "ok"
-
-            i = i + 1
         else:
             assert(False)
 
diff --git a/py/test/Ice/faultTolerance/Server.py b/py/test/Ice/faultTolerance/Server.py
index 0364727cc7a..f36f9a81d19 100644
--- a/py/test/Ice/faultTolerance/Server.py
+++ b/py/test/Ice/faultTolerance/Server.py
@@ -41,9 +41,6 @@ class TestI(Test.TestIntf):
     def idempotentAbort(self, current=None):
         os._exit(0)
 
-    def nonmutatingAbort(self, current=None):
-        os._exit(0)
-
     def pid(self, current=None):
         return os.getpid()
 
diff --git a/py/test/Ice/faultTolerance/Test.ice b/py/test/Ice/faultTolerance/Test.ice
index b2470263e52..f07c5d508eb 100644
--- a/py/test/Ice/faultTolerance/Test.ice
+++ b/py/test/Ice/faultTolerance/Test.ice
@@ -18,7 +18,6 @@ module Test
     void shutdown();
     void abort();
     idempotent void idempotentAbort();
-    idempotent void nonmutatingAbort();
     idempotent int pid();
 };