diff options
author | Arne H Juul <arnej@yahoo-inc.com> | 2017-01-12 13:13:24 +0100 |
---|---|---|
committer | Arne H Juul <arnej@yahoo-inc.com> | 2017-01-12 13:13:24 +0100 |
commit | c6d2a4893a1e620325f2fd363b3065546efc2e64 (patch) | |
tree | b2160ceb7bf9d4a5d322606d7e614e5b1645368c /vespaclient-core/src/main/java/com/yahoo/feedhandler/FeedResponse.java | |
parent | c3e78ef7a72efc0ccd419acf6ac719eb6effdc3d (diff) |
simplify SharedSender API
* require ResultCallback owners to keep their own Pending number
* no longer send numPending in handleReply()
* remove unused remove() method
* get rid of activeOwners map and associated monitor
* waitForPending() now just delegates to the Pending number
Diffstat (limited to 'vespaclient-core/src/main/java/com/yahoo/feedhandler/FeedResponse.java')
-rwxr-xr-x | vespaclient-core/src/main/java/com/yahoo/feedhandler/FeedResponse.java | 7 |
1 files changed, 5 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 7492a48414b..738b4d3303a 100755 --- a/vespaclient-core/src/main/java/com/yahoo/feedhandler/FeedResponse.java +++ b/vespaclient-core/src/main/java/com/yahoo/feedhandler/FeedResponse.java @@ -35,6 +35,7 @@ public final class FeedResponse extends HttpResponse implements SharedSender.Res private final RouteMetricSet metrics; private boolean abortOnError = false; private boolean isAborted = false; + private final SharedSender.Pending pendingNumber = new SharedSender.Pending(); public FeedResponse(RouteMetricSet metrics) { super(com.yahoo.jdisc.http.HttpResponse.Status.OK); @@ -101,7 +102,7 @@ public final class FeedResponse extends HttpResponse implements SharedSender.Res return ""; } - public boolean handleReply(Reply reply, int numPending) { + public boolean handleReply(Reply reply) { metrics.addReply(reply); if (reply.getTrace().getLevel() > 0) { String str = reply.getTrace().toString(); @@ -128,9 +129,11 @@ public final class FeedResponse extends HttpResponse implements SharedSender.Res return false; } } - return numPending > 0; + return true; } + public SharedSender.Pending getPending() { return pendingNumber; } + public void done() { metrics.done(); } |