summaryrefslogtreecommitdiff
path: root/java/src/IceInternal/OutgoingAsyncMessageCallback.java
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2008-03-03 16:45:21 -0500
committerBernard Normier <bernard@zeroc.com>2008-03-03 16:45:21 -0500
commit4c255462f2bb86d2550e880997987b017c3b62e9 (patch)
tree0eb9f8ae8b87b8b156a714ccc4d4d5598a9e1ee4 /java/src/IceInternal/OutgoingAsyncMessageCallback.java
parentvarious fixes, mostly for .NET support (diff)
parentFixed bug 2739 (diff)
downloadice-4c255462f2bb86d2550e880997987b017c3b62e9.tar.bz2
ice-4c255462f2bb86d2550e880997987b017c3b62e9.tar.xz
ice-4c255462f2bb86d2550e880997987b017c3b62e9.zip
Merge branch 'master' of ssh://git/home/git/ice
Diffstat (limited to 'java/src/IceInternal/OutgoingAsyncMessageCallback.java')
-rw-r--r--java/src/IceInternal/OutgoingAsyncMessageCallback.java12
1 files changed, 6 insertions, 6 deletions
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
+};