diff --git a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/handler/BulkRequestHandler.java b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/handler/BulkRequestHandler.java index 453d9cb6961..864c121b641 100644 --- a/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/handler/BulkRequestHandler.java +++ b/modules/dcache-bulk/src/main/java/org/dcache/services/bulk/handler/BulkRequestHandler.java @@ -318,6 +318,12 @@ private boolean setStateIfTerminated(String id, boolean cancelled) { statistics.incrementRequestsCompleted(); return true; } + } catch (BulkRequestNotFoundException e) { + /* + * Request has been cleared already. + */ + LOGGER.debug("setStateIfTerminated, request {} was auto-cleared on termination.", id); + return true; } catch (BulkServiceException e) { LOGGER.error("Failed to post-process request {}: {}.", id, e.toString()); @@ -344,4 +350,4 @@ private boolean storeJobTarget(BulkRequestTarget target) throws BulkServiceExcep return true; } -} \ No newline at end of file +}