Fixed bug 2739

5 files changed, 14 insertions, 14 deletions

diff --git a/java/src/Ice/AMI_Object_ice_flushBatchRequests.java b/java/src/Ice/AMI_Object_ice_flushBatchRequests.java
index 67eeeeef24d..3c95aed0cd3 100644
--- a/java/src/Ice/AMI_Object_ice_flushBatchRequests.java
+++ b/java/src/Ice/AMI_Object_ice_flushBatchRequests.java
@@ -15,7 +15,7 @@ public abstract class AMI_Object_ice_flushBatchRequests extends IceInternal.Batc
 
     public final void __invoke(Ice.ObjectPrx prx)
     {
-        __acquire(prx);
+        __acquireCallback(prx);
         try
         {
             //
@@ -37,7 +37,7 @@ public abstract class AMI_Object_ice_flushBatchRequests extends IceInternal.Batc
         }
         catch(Ice.LocalException ex)
         {
-            __release(ex);
+            __releaseCallback(ex);
         }
     }
 }
diff --git a/java/src/Ice/AMI_Object_ice_invoke.java b/java/src/Ice/AMI_Object_ice_invoke.java
index 7dde41e6e47..46deda21576 100644
--- a/java/src/Ice/AMI_Object_ice_invoke.java
+++ b/java/src/Ice/AMI_Object_ice_invoke.java
@@ -17,7 +17,7 @@ public abstract class AMI_Object_ice_invoke extends IceInternal.OutgoingAsync
     public final void __invoke(Ice.ObjectPrx prx, String operation, OperationMode mode,
                                byte[] inParams, java.util.Map context)
     {
-        __acquire(prx);
+        __acquireCallback(prx);
         try
         {
             __prepare(prx, operation, mode, context);
@@ -27,7 +27,7 @@ public abstract class AMI_Object_ice_invoke extends IceInternal.OutgoingAsync
         }
         catch(LocalException ex)
         {
-            __release(ex);
+            __releaseCallback(ex);
         }
     }
 
@@ -46,6 +46,6 @@ public abstract class AMI_Object_ice_invoke extends IceInternal.OutgoingAsync
             return;
         }
         ice_response(ok, outParams);
-        __release();
+        __releaseCallback();
     }
 }
diff --git a/java/src/IceInternal/BatchOutgoingAsync.java b/java/src/IceInternal/BatchOutgoingAsync.java
index e8c4992090a..3007e9cdf3d 100644
--- a/java/src/IceInternal/BatchOutgoingAsync.java
+++ b/java/src/IceInternal/BatchOutgoingAsync.java
@@ -14,7 +14,7 @@ public abstract class BatchOutgoingAsync extends OutgoingAsyncMessageCallback
     public final void
     __sent(final Ice.ConnectionI connection)
     {
-        __release();
+        __releaseCallback();
     }
     
     public final void
diff --git a/java/src/IceInternal/OutgoingAsync.java b/java/src/IceInternal/OutgoingAsync.java
index 6cb5f0cdb70..ee90ed1d2a5 100644
--- a/java/src/IceInternal/OutgoingAsync.java
+++ b/java/src/IceInternal/OutgoingAsync.java
@@ -20,7 +20,7 @@ public abstract class OutgoingAsync extends OutgoingAsyncMessageCallback
 
             if(!_proxy.ice_isTwoway())
             {
-                __release();
+                __releaseCallback();
             }
             else if(_response)
             {
@@ -203,7 +203,7 @@ public abstract class OutgoingAsync extends OutgoingAsyncMessageCallback
         catch(java.lang.Exception ex)
         {
             __warning(ex);
-            __release();
+            __releaseCallback();
         }
     }
 
diff --git a/java/src/IceInternal/OutgoingAsyncMessageCallback.java b/java/src/IceInternal/OutgoingAsyncMessageCallback.java
index a4a3c120d89..78b5ddb17c9 100644
--- a/java/src/IceInternal/OutgoingAsyncMessageCallback.java
+++ b/java/src/IceInternal/OutgoingAsyncMessageCallback.java
@@ -34,7 +34,7 @@ abstract public class OutgoingAsyncMessageCallback
         }
         finally
         {
-            __release();
+            __releaseCallback();
         }
     }
 
@@ -47,7 +47,7 @@ abstract public class OutgoingAsyncMessageCallback
     }
 
     protected void
-    __acquire(Ice.ObjectPrx proxy)
+    __acquireCallback(Ice.ObjectPrx proxy)
     {
         synchronized(__monitor)
         {
@@ -74,7 +74,7 @@ abstract public class OutgoingAsyncMessageCallback
     }
 
     protected void
-    __release(final Ice.LocalException ex)
+    __releaseCallback(final Ice.LocalException ex)
     {
         synchronized(__monitor)
         {
@@ -101,14 +101,14 @@ abstract public class OutgoingAsyncMessageCallback
             }
             catch(Ice.CommunicatorDestroyedException exc)
             {
-                __release();
+                __releaseCallback();
                 throw exc; // CommunicatorDestroyedException is the only exception that can propagate directly.
             }
         }
     }
 
     protected void
-    __release()
+    __releaseCallback()
     {
         synchronized(__monitor)
         {
@@ -145,4 +145,4 @@ abstract public class OutgoingAsyncMessageCallback
     protected final java.lang.Object __monitor = new java.lang.Object();
     protected BasicStream __is;
     protected BasicStream __os;
-};
\ No newline at end of file
+};