improve error reporting for workdir setting

nuest · Mar 5, 2015 · 303f91b · 303f91b
1 parent 7ce1269
commit 303f91b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/52n-wps-r/src/main/java/org/n52/wps/server/r/workspace/RWorkspace.java b/52n-wps-r/src/main/java/org/n52/wps/server/r/workspace/RWorkspace.java
@@ -252,7 +252,7 @@ public String setWorkingDirectory(RConnection connection,
         if (strategy.equals(CreationStrategy.MANUALBASEDIR) || strategy.equals(CreationStrategy.MANUAL)) {
             try {
                 if (workDirName == null)
-                    throw new ExceptionReport("Error setting working directory with strategy '" + strategy +  "': WorkDirName is 'null' is not set!", "Inconsistent property");
+                    throw new ExceptionReport("Error setting working directory with strategy '" + strategy +  "': workDirName is 'null'!", "Inconsistent property");
 
                 File testFile = new File(workDirName);
                 if ( !testFile.isAbsolute()) {

diff --git a/52n-wps-r/src/main/java/org/n52/wps/server/r/workspace/RWorkspaceManager.java b/52n-wps-r/src/main/java/org/n52/wps/server/r/workspace/RWorkspaceManager.java
@@ -379,6 +379,7 @@ public String prepareWorkspace(Map<String, List<IData>> inputData, String proces
                       RWPSConfigVariables.R_WORK_DIR_NAME,
                       strategy,
                       e);
+            throw e;
         }
 
         this.workspace.setWorkingDirectory(this.connection,