summaryrefslogtreecommitdiffstats
path: root/vespaclient-core
diff options
context:
space:
mode:
authorArne H Juul <arnej@yahoo-inc.com>2017-01-12 11:57:22 +0100
committerArne H Juul <arnej@yahoo-inc.com>2017-01-12 11:58:15 +0100
commit001823fc4249277e222a8b14c83498b8deebfabb (patch)
treeb7465738f151de550c9f6f642b6f87908ec3f87e /vespaclient-core
parent0078face092c8625265efacdf4a9bea9318e2fdb (diff)
fix bug
if abortOnError was false, the old code would always return "true" even with numPending == 0.
Diffstat (limited to 'vespaclient-core')
-rwxr-xr-xvespaclient-core/src/main/java/com/yahoo/feedhandler/FeedResponse.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/vespaclient-core/src/main/java/com/yahoo/feedhandler/FeedResponse.java b/vespaclient-core/src/main/java/com/yahoo/feedhandler/FeedResponse.java
index cdd4ac76c4c..7492a48414b 100755
--- a/vespaclient-core/src/main/java/com/yahoo/feedhandler/FeedResponse.java
+++ b/vespaclient-core/src/main/java/com/yahoo/feedhandler/FeedResponse.java
@@ -123,8 +123,10 @@ public final class FeedResponse extends HttpResponse implements SharedSender.Res
log.finest(str);
addError(str);
}
- isAborted = abortOnError;
- return !abortOnError;
+ if (abortOnError) {
+ isAborted = true;
+ return false;
+ }
}
return numPending > 0;
}