remove timeout test from proxy test. Cleanup of operations test.

1 files changed, 3 insertions, 29 deletions

diff --git a/java/test/Ice/operationsAMD/MyDerivedClassI.java b/java/test/Ice/operationsAMD/MyDerivedClassI.java
index d97d0eb3225..6383fab12e0 100644
--- a/java/test/Ice/operationsAMD/MyDerivedClassI.java
+++ b/java/test/Ice/operationsAMD/MyDerivedClassI.java
@@ -35,13 +35,6 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
         private Test.AMD_MyClass_opVoid _cb;
     }
 
-    public
-    MyDerivedClassI(Ice.ObjectAdapter adapter, Ice.Identity identity)
-    {
-        _adapter = adapter;
-        _identity = identity;
-    }
-
     public void
     shutdown_async(Test.AMD_MyClass_shutdown cb,
                    Ice.Current current)
@@ -58,7 +51,7 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
             }
         }
 
-        _adapter.getCommunicator().shutdown();
+        current.adapter.getCommunicator().shutdown();
         cb.ice_response();
     }
 
@@ -83,23 +76,6 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
     }
 
     public void
-    opSleep_async(Test.AMD_MyClass_opSleep cb, int duration, Ice.Current current)
-    {
-        while(true)
-        {
-            try
-            {
-                Thread.currentThread().sleep(duration);
-                cb.ice_response();
-                break;
-            }
-            catch(java.lang.InterruptedException ex)
-            {
-            }
-        }       
-    }
-
-    public void
     opBool_async(Test.AMD_MyClass_opBool cb,
                  boolean p1, boolean p2,
                  Ice.Current current)
@@ -259,8 +235,8 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
     {
         Test.MyClassPrx p2 = p1;
         Test.MyClassPrx p3 = Test.MyClassPrxHelper.uncheckedCast(
-            _adapter.createProxy(_adapter.getCommunicator().stringToIdentity("noSuchIdentity")));
-        cb.ice_response(Test.MyClassPrxHelper.uncheckedCast(_adapter.createProxy(_identity)), p2, p3);
+            current.adapter.createProxy(current.adapter.getCommunicator().stringToIdentity("noSuchIdentity")));
+        cb.ice_response(Test.MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id)), p2, p3);
     }
 
     public void
@@ -460,7 +436,5 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
         cb.ice_response();
     }
 
-    private Ice.ObjectAdapter _adapter;
-    private Ice.Identity _identity;
     private Thread _opVoidThread;
 }