From 72136dea311d5edd16f56d29cfab46f756367cee Mon Sep 17 00:00:00 2001 From: szznax Date: Fri, 9 Oct 2009 00:04:31 +0000 Subject: [PATCH] handle null path on "create" action --- .../crawler/restlet/EngineResource.java | 47 ++++++++++--------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/engine/src/main/java/org/archive/crawler/restlet/EngineResource.java b/engine/src/main/java/org/archive/crawler/restlet/EngineResource.java index c87a9661..08327f40 100644 --- a/engine/src/main/java/org/archive/crawler/restlet/EngineResource.java +++ b/engine/src/main/java/org/archive/crawler/restlet/EngineResource.java @@ -90,29 +90,34 @@ public class EngineResource extends Resource { String warnStyle = errStyle; String msgStyle = "style=\"margin:1em;padding:0.2em 1em;background:khaki;\""; String path = form.getFirstValue("addpath"); - if (path.indexOf("/") != -1) { + if (path==null) { + String warn = "
WARNING: no job created. " + + "null path given.
\n"; + Flash.addFlash(getResponse(), warn, Flash.Kind.NACK); + System.err.println(warn); + } else if (path.indexOf("/") != -1) { String warn = "
WARNING: " - + "no job created. sub-directories disallowed: " - + "" + path + "
\n"; - Flash.addFlash(getResponse(), warn, Flash.Kind.NACK); - System.err.println(warn); + + "no job created. sub-directories disallowed: " + + "" + path + "\n"; + Flash.addFlash(getResponse(), warn, Flash.Kind.NACK); + System.err.println(warn); } else { - boolean created = false; - try { - created = getEngine().createNewJobWithDefaults(path); - } catch (IOException e) { - String err = "
ERROR! failed to create new job: " - + "" + path + " "+ e.toString() + "
\n"; - Flash.addFlash(getResponse(), err, Flash.Kind.NACK); - System.err.println(err); - - } - if (created) { - String msg = "

Successfully created job: " - + "" + path + "

\n"; - Flash.addFlash(getResponse(), msg, Flash.Kind.NACK); - getEngine().findJobConfigs(); - } + boolean created = false; + try { + created = getEngine().createNewJobWithDefaults(path); + } catch (IOException e) { + String err = "
ERROR! failed to create new job: " + + "" + path + " "+ e.toString() + "
\n"; + Flash.addFlash(getResponse(), err, Flash.Kind.NACK); + System.err.println(err); + + } + if (created) { + String msg = "

Successfully created job: " + + "" + path + "

\n"; + Flash.addFlash(getResponse(), msg, Flash.Kind.NACK); + getEngine().findJobConfigs(); + } } } // default: redirect to GET self