Fixed collocation optimization to use the dispatcher, minor test fixes

1 files changed, 9 insertions, 6 deletions

diff --git a/java/src/IceInternal/OutgoingAsyncMessageCallback.java b/java/src/IceInternal/OutgoingAsyncMessageCallback.java
index 8d830987428..4b6b73a8b06 100644
--- a/java/src/IceInternal/OutgoingAsyncMessageCallback.java
+++ b/java/src/IceInternal/OutgoingAsyncMessageCallback.java
@@ -30,17 +30,20 @@ public interface OutgoingAsyncMessageCallback
     // connection will call the __invokeSent() method bellow (which in turn should call the 
     // sent callback).
     //
-    public abstract boolean __sent();
+    boolean __sent();
 
     //
     // Called by the connection to call the user sent callback.
     //
-    public abstract void __invokeSent();
+    void __invokeSent();
     
     //
-    // Called by the connection when the request failed. The boolean indicates whether or
-    // not the message was possibly sent (this is useful for retry to figure out whether
-    // or not the request can't be retried without breaking at-most-once semantics.)
+    // Called by the connection when the request failed.
     //
-    public abstract void __finished(Ice.Exception ex, boolean sent);
+    void __finished(Ice.Exception ex);
+
+    //
+    // Helper to dispatch invocation timeout.
+    //
+    void __dispatchInvocationTimeout(ThreadPool threadPool, Ice.Connection connection);
 }