1 files changed, 6 insertions, 0 deletions
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 ada4cfb1725..8661a4e4db1 100755
--- a/vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandler.java
+++ b/vespaclient-core/src/main/java/com/yahoo/feedhandler/VespaFeedHandler.java
@@ -123,6 +123,9 @@ public final class VespaFeedHandler extends VespaFeedHandlerBase {
         public boolean isAborted() {
             return simpleFeedAccess.isAborted();
         }
+        void  close() {
+            executor.shutdown();
+        }
     }
 
     public HttpResponse handle(HttpRequest request, RouteMetricSet.ProgressCallback callback, int numThreads) {
@@ -162,6 +165,9 @@ public final class VespaFeedHandler extends VespaFeedHandlerBase {
             }
 
             sender.done();
+            if (feedAccess instanceof ThreadedFeedAccess) {
+                ((ThreadedFeedAccess)feedAccess).close();
+            }
 
             if (asynchronous) {
                 return response;