summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-06-02 10:50:08 +0200
committerBenoit Foucher <benoit@zeroc.com>2017-06-02 10:50:08 +0200
commit375f62bfb182caaaa38d9c7884893ee41c97b2c9 (patch)
tree30825b2fb7e78b8d67c3eef3b441eebb9d5b741b /java/src
parentFixed build failure (diff)
downloadice-375f62bfb182caaaa38d9c7884893ee41c97b2c9.tar.bz2
ice-375f62bfb182caaaa38d9c7884893ee41c97b2c9.tar.xz
ice-375f62bfb182caaaa38d9c7884893ee41c97b2c9.zip
Fixed iOS Objective-C build failure
Diffstat (limited to 'java/src')
-rw-r--r--java/src/Ice/src/main/java/com/zeroc/IceInternal/InvocationFutureI.java23
1 files changed, 3 insertions, 20 deletions
diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/InvocationFutureI.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/InvocationFutureI.java
index 3be5400e401..951a103fe44 100644
--- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/InvocationFutureI.java
+++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/InvocationFutureI.java
@@ -133,30 +133,13 @@ public abstract class InvocationFutureI<T> extends com.zeroc.Ice.InvocationFutur
// calling thread if the request was sent synchronously. Calling complete() or
// completeExceptionally() on _sentFuture invokes the action from this thread.
//
- if(_sentSynchronously)
+ if(_exception != null)
{
- if(_exception != null)
- {
- _sentFuture.completeExceptionally(_exception);
- }
- else
- {
- _sentFuture.complete(_sentSynchronously);
- }
+ _sentFuture.completeExceptionally(_exception);
}
else
{
- if(_exception != null)
- {
- dispatch(() ->
- {
- _sentFuture.completeExceptionally(_exception);
- });
- }
- else
- {
- invokeSentAsync();
- }
+ _sentFuture.complete(_sentSynchronously);
}
}
return r;