summaryrefslogtreecommitdiff
path: root/java/src/IceInternal/BatchOutgoingAsync.java
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2014-06-27 10:31:41 +0200
committerBenoit Foucher <benoit@zeroc.com>2014-06-27 10:31:41 +0200
commita4f93259dc3494d98addf38e69b87eb557d432b3 (patch)
treed2b78bb5cea24e33dc1b46be22dba6167e96c9ed /java/src/IceInternal/BatchOutgoingAsync.java
parentFix for ICE-5515 (ice_staticId on proxies) in Java, C#, Python, Ruby and PHP ... (diff)
downloadice-a4f93259dc3494d98addf38e69b87eb557d432b3.tar.bz2
ice-a4f93259dc3494d98addf38e69b87eb557d432b3.tar.xz
ice-a4f93259dc3494d98addf38e69b87eb557d432b3.zip
Better collocation optimization, fix for ICE-5489, ICE-5484
Diffstat (limited to 'java/src/IceInternal/BatchOutgoingAsync.java')
-rw-r--r--java/src/IceInternal/BatchOutgoingAsync.java10
1 files changed, 8 insertions, 2 deletions
diff --git a/java/src/IceInternal/BatchOutgoingAsync.java b/java/src/IceInternal/BatchOutgoingAsync.java
index cfec8416234..6153624c88e 100644
--- a/java/src/IceInternal/BatchOutgoingAsync.java
+++ b/java/src/IceInternal/BatchOutgoingAsync.java
@@ -22,13 +22,19 @@ public class BatchOutgoingAsync extends Ice.AsyncResult implements OutgoingAsync
return connection.flushAsyncBatchRequests(this);
}
+ public int
+ __invokeCollocated(CollocatedRequestHandler handler)
+ {
+ return handler.invokeAsyncBatchRequests(this);
+ }
+
public boolean
__sent()
{
synchronized(_monitor)
{
_state |= Done | OK | Sent;
- _os.resize(0, false); // Clear buffer now, instead of waiting for AsyncResult deallocation
+ //_os.resize(0, false); // Don't clear the buffer now, it's needed for the collocation optimization
if(_remoteObserver != null)
{
_remoteObserver.detach();
@@ -51,7 +57,7 @@ public class BatchOutgoingAsync extends Ice.AsyncResult implements OutgoingAsync
}
public void
- __finished(Ice.LocalException exc, boolean sent)
+ __finished(Ice.Exception exc, boolean sent)
{
if(_remoteObserver != null)
{