From ca32d0d448fa925f47dd25cec8e14b0e38e9ee4e Mon Sep 17 00:00:00 2001 From: gojomo Date: Thu, 22 Apr 2010 01:59:41 +0000 Subject: [PATCH] HER-1692 Cannot create profile with same name as job * JobResource.java if destination of copy-job fails, show flash error --- .../java/org/archive/crawler/restlet/JobResource.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/engine/src/main/java/org/archive/crawler/restlet/JobResource.java b/engine/src/main/java/org/archive/crawler/restlet/JobResource.java index af69fd08..71563fe2 100644 --- a/engine/src/main/java/org/archive/crawler/restlet/JobResource.java +++ b/engine/src/main/java/org/archive/crawler/restlet/JobResource.java @@ -54,7 +54,6 @@ import org.restlet.data.MediaType; import org.restlet.data.Reference; import org.restlet.data.Request; import org.restlet.data.Response; -import org.restlet.data.Status; import org.restlet.resource.Representation; import org.restlet.resource.ResourceException; import org.restlet.resource.Variant; @@ -230,6 +229,7 @@ public class JobResource extends BaseResource { // TODO: replace with use a templating system (FreeMarker?) pw.println(""+jobTitle+""); pw.println(""); + pw.println(""); pw.print("

Job "+cj.getShortName()+" ("); @@ -599,13 +599,15 @@ public class JobResource extends BaseResource { // default: redirect to GET self getResponse().redirectSeeOther(getRequest().getOriginalRef()); - } + } protected void copyJob(String copyTo, boolean asProfile) throws ResourceException { try { getEngine().copy(cj, copyTo, asProfile); } catch (IOException e) { - throw new ResourceException(Status.CLIENT_ERROR_CONFLICT,e); + Flash.addFlash(getResponse(), "Job not copied: "+e.getMessage(), Flash.Kind.NACK); + getResponse().redirectSeeOther(getRequest().getOriginalRef()); + return; } // redirect to destination job page getResponse().redirectSeeOther(copyTo);