Override awaitTermination() as well

1 files changed, 6 insertions, 0 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java
index d0780a5b2d8..e62812af494 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/TenantRepository.java
@@ -645,6 +645,12 @@ public class TenantRepository {
             return executorService.shutdownNow();
         }
 
+        @Override
+        public boolean awaitTermination(long timeout, TimeUnit unit) throws InterruptedException {
+            if ( ! super.awaitTermination(timeout, unit)) return false;
+            return executorService.awaitTermination(timeout, unit);
+        }
+
     }
 
 }