fix

4 files changed, 8 insertions, 18 deletions

diff --git a/java/src/Ice/ObjectPrxHelper.java b/java/src/Ice/ObjectPrxHelper.java
index 07f850ab756..4f5ad021983 100644
--- a/java/src/Ice/ObjectPrxHelper.java
+++ b/java/src/Ice/ObjectPrxHelper.java
@@ -220,20 +220,8 @@ public class ObjectPrxHelper implements ObjectPrx
     ice_invoke_async(AMI_Object_ice_invoke cb, String operation, OperationMode mode, byte[] inParams,
 		     java.util.Map context)
     {
-        int __cnt = 0;
-        while(true)
-        {
-            try
-            {
-//                _ObjectDel __del = __getDelegate();
-//                __del.ice_invoke_async(cb, operation, mode, inParams, context);
-		return;
-            }
-            catch(LocalException __ex)
-            {
-                __cnt = __handleException(__ex, __cnt);
-            }
-        }
+	__checkTwowayOnly("ice_invoke_async");
+	cb.__invoke(__reference(), operation, mode, inParams, context);
     }
 
     public final Identity
diff --git a/java/src/IceInternal/OutgoingAsync.java b/java/src/IceInternal/OutgoingAsync.java
index 6f2c72436ef..66426d69609 100644
--- a/java/src/IceInternal/OutgoingAsync.java
+++ b/java/src/IceInternal/OutgoingAsync.java
@@ -220,7 +220,7 @@ public abstract class OutgoingAsync
 		{
 		    try
 		    {
-			wait();
+			_monitor.wait();
 		    }
 		    catch(InterruptedException ex)
 		    {
@@ -375,6 +375,8 @@ public abstract class OutgoingAsync
 	    __os.destroy();
 	    __os = null;
 	}
+
+	_monitor.notify();
     }
 
     protected BasicStream __is;
diff --git a/java/test/Ice/faultTolerance/Server.java b/java/test/Ice/faultTolerance/Server.java
index 54066b79037..33f9a71d828 100644
--- a/java/test/Ice/faultTolerance/Server.java
+++ b/java/test/Ice/faultTolerance/Server.java
@@ -61,7 +61,7 @@ public class Server
 
         communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p " + port);
         Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
-        Ice.Object object = new TestI(adapter);
+        Ice.Object object = new TestI(adapter, port);
         adapter.add(object, Ice.Util.stringToIdentity("test"));
         adapter.activate();
         communicator.waitForShutdown();
diff --git a/java/test/Ice/faultTolerance/TestI.java b/java/test/Ice/faultTolerance/TestI.java
index 9faab4112ff..61873e62c40 100644
--- a/java/test/Ice/faultTolerance/TestI.java
+++ b/java/test/Ice/faultTolerance/TestI.java
@@ -15,10 +15,10 @@
 public final class TestI extends _TestDisp
 {
     public
-    TestI(Ice.ObjectAdapter adapter)
+    TestI(Ice.ObjectAdapter adapter, int port)
     {
         _adapter = adapter;
-	_pseudoPid = (new java.util.Random()).nextInt();
+	_pseudoPid = port; // We use the port number instead of the process ID in Java.
     }
 
     public void