Fix JENKINS-15008

Make the message clear as to what is missing
jenkinsci · Oct 1, 2012 · 33dbcc6 · 33dbcc6
1 parent 81515ac
commit 33dbcc6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/main/java/hudson/plugins/emailext/plugins/content/WorkspaceFileContent.java b/src/main/java/hudson/plugins/emailext/plugins/content/WorkspaceFileContent.java
@@ -38,6 +38,8 @@ public <P extends AbstractProject<P, B>, B extends AbstractBuild<P, B>> String g
         String path = Args.get(args, VAR_PATH_NAME, null);
         if (path == null) {
             throw new IllegalArgumentException("FILE token requires the " + VAR_PATH_NAME + " parameter");
+        } else if(!build.getWorkspace().child(path).exists()) {
+            return "ERROR: File '" + path + "' does not exist";
         }
 
         try {

diff --git a/src/test/java/hudson/plugins/emailext/plugins/content/WorkspaceFileContentTest.java b/src/test/java/hudson/plugins/emailext/plugins/content/WorkspaceFileContentTest.java
@@ -28,6 +28,6 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
 
         WorkspaceFileContent content = new WorkspaceFileContent();
         assertEquals("Hello, world!", content.getContent(build, null, null, Collections.singletonMap("path", "foo")));
-        assertNull(content.getContent(build, null, null, Collections.singletonMap("path", "no-such-file")));
+	assertEquals("ERROR: File 'no-such-file' does not exist", content.getContent(build, null, null, Collections.singletonMap("path", "no-such-file")));
     }
 }