summaryrefslogtreecommitdiff
path: root/java/src/Ice/ObjectPrxHelperBase.java
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2009-11-25 15:05:41 +0100
committerBenoit Foucher <benoit@zeroc.com>2009-11-25 15:05:41 +0100
commit2fca2c1309c4991b21ff956709068122f19eef4a (patch)
treeb90e6fe1450508f5ce2962e21627a4535414e1a6 /java/src/Ice/ObjectPrxHelperBase.java
parentUpdate depends for SQL directories (diff)
downloadice-2fca2c1309c4991b21ff956709068122f19eef4a.tar.bz2
ice-2fca2c1309c4991b21ff956709068122f19eef4a.tar.xz
ice-2fca2c1309c4991b21ff956709068122f19eef4a.zip
- Cleaned up test/Ice/operations test
- Added test/Ice/ami test - sent callback is now always called
Diffstat (limited to 'java/src/Ice/ObjectPrxHelperBase.java')
-rw-r--r--java/src/Ice/ObjectPrxHelperBase.java18
1 files changed, 2 insertions, 16 deletions
diff --git a/java/src/Ice/ObjectPrxHelperBase.java b/java/src/Ice/ObjectPrxHelperBase.java
index 171abe39367..891fe6653e4 100644
--- a/java/src/Ice/ObjectPrxHelperBase.java
+++ b/java/src/Ice/ObjectPrxHelperBase.java
@@ -1832,25 +1832,11 @@ public class ObjectPrxHelperBase implements ObjectPrx, java.io.Serializable
private AsyncResult
begin_ice_flushBatchRequestsInternal(IceInternal.CallbackBase __cb)
{
- IceInternal.BatchOutgoingAsync __result =
+ IceInternal.ProxyBatchOutgoingAsync __result =
new IceInternal.ProxyBatchOutgoingAsync(this, __ice_flushBatchRequests_name, __cb);
try
{
- //
- // We don't automatically retry if ice_flushBatchRequests fails. Otherwise, if some batch
- // requests were queued with the connection, they would be lost without being noticed.
- //
- _ObjectDel delegate = null;
- int cnt = -1; // Don't retry.
- try
- {
- delegate = __getDelegate(false);
- delegate.__getRequestHandler().flushAsyncBatchRequests(__result);
- }
- catch(LocalException __ex)
- {
- cnt = __handleException(delegate, __ex, null, cnt);
- }
+ __result.__send();
}
catch(LocalException __ex)
{