diff options
author | Harald Musum <musum@oath.com> | 2018-10-29 19:52:13 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-29 19:52:13 +0100 |
commit | 27a98339d105f0ef7b3cd7397379e251115f8f60 (patch) | |
tree | dc809780a7fefd5ce92655c381852bbfc72e0880 /vespaclient-core/src/main/java/com/yahoo/feedhandler | |
parent | 3caf9568a1c69b4ce79b4df6d9fcaeb313cd80d8 (diff) |
Revert "Also obey the timeout."
Diffstat (limited to 'vespaclient-core/src/main/java/com/yahoo/feedhandler')
-rw-r--r-- | vespaclient-core/src/main/java/com/yahoo/feedhandler/ThreadedFeedAccess.java | 4 | ||||
-rwxr-xr-x | vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandler.java | 5 |
2 files changed, 2 insertions, 7 deletions
diff --git a/vespaclient-core/src/main/java/com/yahoo/feedhandler/ThreadedFeedAccess.java b/vespaclient-core/src/main/java/com/yahoo/feedhandler/ThreadedFeedAccess.java index f09e9ae7662..3ad3e0b7f42 100644 --- a/vespaclient-core/src/main/java/com/yahoo/feedhandler/ThreadedFeedAccess.java +++ b/vespaclient-core/src/main/java/com/yahoo/feedhandler/ThreadedFeedAccess.java @@ -79,8 +79,4 @@ final class ThreadedFeedAccess implements SimpleFeedAccess { executorService.shutdown(); } } - @Override - public boolean hasTimedOut() { - return simpleFeedAccess.hasTimedOut(); - } } diff --git a/vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandler.java b/vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandler.java index 27904b5369c..4adfe3ebe1d 100755 --- a/vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandler.java +++ b/vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandler.java @@ -80,12 +80,10 @@ public final class VespaFeedHandler extends VespaFeedHandlerBase { MessagePropertyProcessor.PropertySetter properties = getPropertyProcessor().buildPropertySetter(request); - long millis = getTimeoutMillis(request); - String route = properties.getRoute().toString(); FeedResponse response = new FeedResponse(new RouteMetricSet(route, callback)); - SingleSender sender = new SingleSender(response, getSharedSender(route), millis, !asynchronous); + SingleSender sender = new SingleSender(response, getSharedSender(route), !asynchronous); sender.addMessageProcessor(properties); sender.addMessageProcessor(new DocprocMessageProcessor(getDocprocChain(request), getDocprocServiceRegistry(request))); ThreadedFeedAccess feedAccess = new ThreadedFeedAccess(numThreads, sender); @@ -108,6 +106,7 @@ public final class VespaFeedHandler extends VespaFeedHandlerBase { if (asynchronous) { return response; } + long millis = getTimeoutMillis(request); boolean completed = sender.waitForPending(millis); if (!completed) { response.addError(Error.TIMEOUT, "Timed out after " + millis + " ms waiting for responses"); |