diff --git a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/BulkServiceCommands.java b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/BulkServiceCommands.java index f43d2acac27..3628b1f258c 100644 --- a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/BulkServiceCommands.java +++ b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/BulkServiceCommands.java @@ -1434,6 +1434,10 @@ public PagedTargetResult call() throws Exception { private JdbcBulkArchiveDao archiveDao; + public void shutdown() { + executor.shutdown(); + } + @Required public void setActivityFactory(BulkActivityFactory activityFactory) { this.activityFactory = activityFactory; diff --git a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/manager/ConcurrentRequestManager.java b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/manager/ConcurrentRequestManager.java index aa7808a04c3..0357f270b60 100644 --- a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/manager/ConcurrentRequestManager.java +++ b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/manager/ConcurrentRequestManager.java @@ -408,6 +408,7 @@ public void shutdown() throws Exception { requestJobs = null; cancelledTargets = null; requestStore.clearCache(); + processorExecutorService.shutdown(); } @Override diff --git a/modules/dcache-bulk/src/main/resources/org/dcache/services/bulk/bulk.xml b/modules/dcache-bulk/src/main/resources/org/dcache/services/bulk/bulk.xml index 3635b42f18a..c6023775ef7 100644 --- a/modules/dcache-bulk/src/main/resources/org/dcache/services/bulk/bulk.xml +++ b/modules/dcache-bulk/src/main/resources/org/dcache/services/bulk/bulk.xml @@ -295,7 +295,7 @@ - + Holds the various commands for administrative purposes.