Fix JENKINS-12865

jenkinsci · Feb 23, 2012 · 1032c41 · 1032c41
1 parent b9e2cd5
commit 1032c41
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/main/java/org/jenkinsci/plugins/fstrigger/service/FSTriggerComputeFileService.java b/src/main/java/org/jenkinsci/plugins/fstrigger/service/FSTriggerComputeFileService.java
@@ -10,6 +10,7 @@
 import org.jenkinsci.lib.xtrigger.XTriggerLog;
 import org.jenkinsci.plugins.fstrigger.triggers.FileNameTriggerInfo;
 
+import java.io.File;
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.Map;
@@ -38,7 +39,11 @@ public FilePath computedFile(Node node, AbstractProject project, final FileNameT
             final Map<String, String> envVars = varsRetriever.getPollingEnvVars(project, node);
             return node.getRootPath().act(new Callable<FilePath, XTriggerException>() {
                 public FilePath call() throws XTriggerException {
-                    return new FilePath(new FSTriggerFileNameRetriever(fileInfo, log, envVars).getFile());
+                    File file = new FSTriggerFileNameRetriever(fileInfo, log, envVars).getFile();
+                    if (file == null) {
+                        return null;
+                    }
+                    return new FilePath(file);
                 }
             });
 

diff --git a/src/main/java/org/jenkinsci/plugins/fstrigger/service/FSTriggerFileNameRetriever.java b/src/main/java/org/jenkinsci/plugins/fstrigger/service/FSTriggerFileNameRetriever.java
@@ -45,6 +45,7 @@ public FSTriggerFileNameRetriever(FileNameTriggerInfo fileInfo, XTriggerLog log,
     public File getFile() throws XTriggerException {
 
         if (fileInfo.getFilePathPattern() == null) {
+            log.info("A file pattern must be set.");
             return null;
         }