5 files changed, 6 insertions, 56 deletions
diff --git a/java/src/Ice/AsyncResult.java b/java/src/Ice/AsyncResult.java
index 24b17fe10db..3887ff39d09 100644
--- a/java/src/Ice/AsyncResult.java
+++ b/java/src/Ice/AsyncResult.java
@@ -87,7 +87,7 @@ public class AsyncResult
         }
     }
 
-    public final boolean sentSynchronously()
+    public final boolean isSentSynchronously()
     {
         return _sentSynchronously; // No lock needed, immutable once __send() is called
     }
diff --git a/java/src/Ice/ExceptionCallback.java b/java/src/Ice/ExceptionCallback.java
deleted file mode 100644
index b213f639938..00000000000
--- a/java/src/Ice/ExceptionCallback.java
+++ /dev/null
@@ -1,50 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2009 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-package Ice;
-
-/**
- * An application can optionally supply an instance of this class in an
- * asynchronous invocation. The application must create a subclass and
- * implement the exception method.
- **/
-public abstract class ExceptionCallback extends Callback
-{
-    /**
-     * Called when the invocation raises an Ice run-time exception.
-     *
-     * @param __ex The Ice run-time exception raised by the operation.
-     **/
-    public abstract void exception(LocalException __ex);
-
-    /**
-     * Called when a queued invocation is sent successfully.
-     **/
-    public void sent(boolean sentSynchronously)
-    {
-    }
-
-    public final void __completed(AsyncResult __result)
-    {
-        try
-        {
-            __result.__wait();
-        }
-        catch(LocalException __ex)
-        {
-            exception(__ex);
-            return;
-        }
-    }
-
-    public final void __sent(AsyncResult __result)
-    {
-        sent(__result.sentSynchronously());
-    }
-}
diff --git a/java/src/Ice/ObjectPrxHelperBase.java b/java/src/Ice/ObjectPrxHelperBase.java
index 891fe6653e4..1b477144914 100644
--- a/java/src/Ice/ObjectPrxHelperBase.java
+++ b/java/src/Ice/ObjectPrxHelperBase.java
@@ -1025,7 +1025,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable
     ice_invoke_async(AMI_Object_ice_invoke cb, String operation, OperationMode mode, byte[] inParams)
     {
         AsyncResult __result = begin_ice_invoke(operation, mode, inParams, cb);
-        return __result.sentSynchronously();
+        return __result.isSentSynchronously();
     }
 
     /**
@@ -1048,7 +1048,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable
                      java.util.Map<String, String> context)
     {
         AsyncResult __result = begin_ice_invoke(operation, mode, inParams, context, cb);
-        return __result.sentSynchronously();
+        return __result.isSentSynchronously();
     }
 
     /**
@@ -1786,7 +1786,7 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable
     ice_flushBatchRequests_async(AMI_Object_ice_flushBatchRequests cb)
     {
         AsyncResult result = begin_ice_flushBatchRequests(cb);
-        return result.sentSynchronously();
+        return result.isSentSynchronously();
     }
 
     /**
diff --git a/java/src/Ice/OnewayCallback.java b/java/src/Ice/OnewayCallback.java
index 7464e397911..3e71390a36a 100644
--- a/java/src/Ice/OnewayCallback.java
+++ b/java/src/Ice/OnewayCallback.java
@@ -35,7 +35,7 @@ public abstract class OnewayCallback extends IceInternal.CallbackBase
 
     public final void __sent(AsyncResult __result)
     {
-        sent(__result.sentSynchronously());
+        sent(__result.isSentSynchronously());
     }
 
     public final void __completed(AsyncResult __result)
diff --git a/java/src/Ice/TwowayCallback.java b/java/src/Ice/TwowayCallback.java
index 78b022fd58a..6ca469b417a 100644
--- a/java/src/Ice/TwowayCallback.java
+++ b/java/src/Ice/TwowayCallback.java
@@ -30,6 +30,6 @@ public abstract class TwowayCallback extends IceInternal.CallbackBase
 
     public final void __sent(AsyncResult __result)
     {
-        sent(__result.sentSynchronously());
+        sent(__result.isSentSynchronously());
     }
 }