From c547ddd5660884703044775d180ae22da01ba69a Mon Sep 17 00:00:00 2001 From: Paul Millar Date: Tue, 10 Dec 2013 08:59:21 +0100 Subject: [PATCH] srm: fix Copy scheduling Recent refactoring resulted in srmCopy operations failing with the message: Scheduler for class class org.dcache.srm.request.CopyRequest is not supported. This patch fixes srmCopy and the error message. Target: master Requires-book: no Requires-notes: no --- .../src/main/java/org/dcache/srm/request/CopyRequest.java | 6 ++++++ .../java/org/dcache/srm/scheduler/SchedulerContainer.java | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/srm-server/src/main/java/org/dcache/srm/request/CopyRequest.java b/modules/srm-server/src/main/java/org/dcache/srm/request/CopyRequest.java index 8f584a80a8e..134fc1ac06a 100644 --- a/modules/srm-server/src/main/java/org/dcache/srm/request/CopyRequest.java +++ b/modules/srm-server/src/main/java/org/dcache/srm/request/CopyRequest.java @@ -359,6 +359,12 @@ public void proccessRequest() throws DataAccessException, IOException, getTURLs(); } + @Override + public Class getSchedulerType() + { + return Job.class; + } + private void identify() throws IOException, SRMException { wlock(); try { diff --git a/modules/srm-server/src/main/java/org/dcache/srm/scheduler/SchedulerContainer.java b/modules/srm-server/src/main/java/org/dcache/srm/scheduler/SchedulerContainer.java index f684263be50..5cadf7011e1 100644 --- a/modules/srm-server/src/main/java/org/dcache/srm/scheduler/SchedulerContainer.java +++ b/modules/srm-server/src/main/java/org/dcache/srm/scheduler/SchedulerContainer.java @@ -89,8 +89,8 @@ private Scheduler getScheduler(Scheduler suggestion, Class type) } if (suggestion == null) { - throw new UnsupportedOperationException("Scheduler for class " + - type + " is not supported"); + throw new UnsupportedOperationException("Scheduler for " + type + + " is not supported"); } return suggestion;