From 159644c45ab83b61ffeb1abe45245a1a010db1e7 Mon Sep 17 00:00:00 2001 From: Konstantin Welke Date: Tue, 5 Jul 2016 15:50:35 +0200 Subject: [PATCH] Log a message instead of throwing a NullPointerException when not being able to load a build's workspace --- .../FileBuildParameters.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/hudson/plugins/parameterizedtrigger/FileBuildParameters.java b/src/main/java/hudson/plugins/parameterizedtrigger/FileBuildParameters.java index c3739cbe..d2f27321 100644 --- a/src/main/java/hudson/plugins/parameterizedtrigger/FileBuildParameters.java +++ b/src/main/java/hudson/plugins/parameterizedtrigger/FileBuildParameters.java @@ -38,13 +38,10 @@ import java.util.List; import java.util.Map; import java.util.Properties; -import java.util.logging.Logger; import jenkins.util.VirtualFile; public class FileBuildParameters extends AbstractBuildParameters { - private static final Logger LOGGER = Logger.getLogger(FileBuildParameters.class.getName()); - private final String propertiesFile; private final String encoding; private final boolean failTriggerOnMissing; @@ -122,10 +119,15 @@ private List extractAllValues(AbstractBuild build, TaskList } if (s == null) { - FilePath f = build.getWorkspace().child(file); - if (f.exists()) { - s = ParameterizedTriggerUtils.readFileToString(f, getEncoding()); - } + FilePath workspace = build.getWorkspace(); + if (workspace == null) { + listener.getLogger().printf(Plugin.LOG_TAG + " Could not load workspace of build %s%n", build.getFullDisplayName()); + } else { + FilePath f = workspace.child(file); + if (f.exists()) { + s = ParameterizedTriggerUtils.readFileToString(f, getEncoding()); + } + } } if (s == null) {