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

1 files changed, 3 insertions, 29 deletions

diff --git a/java/test/Ice/operations/MyDerivedClassI.java b/java/test/Ice/operations/MyDerivedClassI.java
index 7e44f5be060..0650751b39d 100644
--- a/java/test/Ice/operations/MyDerivedClassI.java
+++ b/java/test/Ice/operations/MyDerivedClassI.java
@@ -18,17 +18,10 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
         }
     }
 
-    public
-    MyDerivedClassI(Ice.ObjectAdapter adapter, Ice.Identity identity)
-    {
-        _adapter = adapter;
-        _identity = identity;
-    }
-
     public void
     shutdown(Ice.Current current)
     {
-        _adapter.getCommunicator().shutdown();
+        current.adapter.getCommunicator().shutdown();
     }
 
     public void
@@ -36,22 +29,6 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
     {
     }
 
-    public void
-    opSleep(int duration, Ice.Current current)
-    {
-        while(true)
-        {
-            try
-            {
-                Thread.currentThread().sleep(duration);
-                break;
-            }
-            catch(java.lang.InterruptedException ex)
-            {
-            }
-        }       
-    }
-
     public boolean
     opBool(boolean p1, boolean p2,
            Ice.BooleanHolder p3,
@@ -216,8 +193,8 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
     {
         p2.value = p1;
         p3.value = Test.MyClassPrxHelper.uncheckedCast(
-            _adapter.createProxy(_adapter.getCommunicator().stringToIdentity("noSuchIdentity")));
-        return Test.MyClassPrxHelper.uncheckedCast(_adapter.createProxy(_identity));
+            current.adapter.createProxy(current.adapter.getCommunicator().stringToIdentity("noSuchIdentity")));
+        return Test.MyClassPrxHelper.uncheckedCast(current.adapter.createProxy(current.id));
     }
 
     public Test.MyEnum
@@ -417,7 +394,4 @@ public final class MyDerivedClassI extends Test.MyDerivedClass
     opDerived(Ice.Current current)
     {
     }
-
-    private Ice.ObjectAdapter _adapter;
-    private Ice.Identity _identity;
 }