Merged Mark's pythonami branch

4 files changed, 2 insertions, 117 deletions

diff --git a/java/test/Ice/ami/AllTests.java b/java/test/Ice/ami/AllTests.java
index 549bb9e41b3..e97a959268c 100644
--- a/java/test/Ice/ami/AllTests.java
+++ b/java/test/Ice/ami/AllTests.java
@@ -439,7 +439,6 @@ public class AllTests
     {
         FlushExCallback()
         {
-            _thread = Thread.currentThread().getId();
         }
 
         public void
@@ -480,8 +479,6 @@ public class AllTests
         {
             test(false);
         }
-
-        long _thread;
     }
 
     enum ThrowType { LocalException, OtherException };
diff --git a/java/test/Ice/exceptions/AllTests.java b/java/test/Ice/exceptions/AllTests.java
index 8fec6291ebd..afc68f037d2 100644
--- a/java/test/Ice/exceptions/AllTests.java
+++ b/java/test/Ice/exceptions/AllTests.java
@@ -2144,7 +2144,7 @@ public class AllTests
 
             out.println("ok");
 
-            out.print("catching unknown non-Ice exception with AMI... ");
+            out.print("catching unknown non-Ice exception with new AMI mapping... ");
             out.flush();
 
             {
diff --git a/java/test/Ice/operations/OnewaysNewAMI.java b/java/test/Ice/operations/OnewaysNewAMI.java
index 6e7ffa0f85b..fdcf7522f83 100644
--- a/java/test/Ice/operations/OnewaysNewAMI.java
+++ b/java/test/Ice/operations/OnewaysNewAMI.java
@@ -76,7 +76,7 @@ class OnewaysNewAMI
         {
             test(false);
         }        
-    };
+    }
 
     static void
     onewaysNewAMI(test.Util.Application app, MyClassPrx proxy)
diff --git a/java/test/Ice/operations/TwowaysNewAMI.java b/java/test/Ice/operations/TwowaysNewAMI.java
index e6805d85fbc..b7e90680162 100644
--- a/java/test/Ice/operations/TwowaysNewAMI.java
+++ b/java/test/Ice/operations/TwowaysNewAMI.java
@@ -207,32 +207,6 @@ class TwowaysNewAMI
         private Callback callback = new Callback();
     }
 
-    /*
-    private static class opVoidExI extends Ice.ResponseDelegate
-    {
-        public void
-        ice_response()
-        {
-            test(false);
-        }
-
-        public void
-        ice_exception(Ice.LocalException ex)
-        {
-            test(ex instanceof Ice.NoEndpointException);
-            callback.called();
-        }
-
-        public void
-        check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-    }
-    */
-
     private static class opByteI extends Callback_MyClass_opByte
     {
         @Override
@@ -257,32 +231,6 @@ class TwowaysNewAMI
         private Callback callback = new Callback();
     }
 
-    /*
-    private static class opByteExI extends Callback_MyClass_opByte
-    {
-        public void
-        ice_response(byte r, byte b)
-        {
-            test(false);
-        }
-
-        public void
-        ice_exception(Ice.LocalException ex)
-        {
-            test(ex instanceof Ice.NoEndpointException);
-            callback.called();
-        }
-
-        public void
-        check()
-        {
-            callback.check();
-        }
-
-        private Callback callback = new Callback();
-    }
-    */
-
     private static class opBoolI extends Callback_MyClass_opBool
     {
         @Override
@@ -1135,66 +1083,6 @@ class TwowaysNewAMI
         private Callback callback = new Callback();
     }
 
-    /*
-    private static class opContextEqualI extends Callback_MyClass_opContext
-    {
-        Callback_MyClass_opContextEqualI(java.util.Map<String, String> d)
-        {
-            _d = d;
-        }
-
-        @Override
-        public void response(java.util.Map r)
-        {
-            test(r.equals(_d));
-            callback.called();
-        }
-
-        @Override
-        public void exception(Ice.LocalException ex)
-        {
-            test(false);
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private java.util.Map<String, String> _d;
-        private Callback callback = new Callback();
-    }
-
-    private static class opContextNotEqualI extends Callback_MyClass_opContext
-    {
-        Callback_MyClass_opContextNotEqualI(java.util.Map<String, String> d)
-        {
-            _d = d;
-        }
-
-        @Override
-        public void response(java.util.Map r)
-        {
-            test(!r.equals(_d));
-            callback.called();
-        }
-
-        @Override
-        public void exception(Ice.LocalException ex)
-        {
-            test(false);
-        }
-
-        public void check()
-        {
-            callback.check();
-        }
-
-        private java.util.Map<String, String> _d;
-        private Callback callback = new Callback();
-    }
-    */
-
     private static class opDerivedI extends Callback_MyDerivedClass_opDerived
     {
         @Override