From 95c73c313f64d6a656d993c9ed03184fa95d958f Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 14 Oct 2014 08:32:44 -0400 Subject: [PATCH] NPE in form validation when configured on a non-AbstractProject, like a workflow job. --- core/src/main/java/hudson/tasks/ArtifactArchiver.java | 3 +++ core/src/main/java/hudson/tasks/Fingerprinter.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/core/src/main/java/hudson/tasks/ArtifactArchiver.java b/core/src/main/java/hudson/tasks/ArtifactArchiver.java index 00aa79b9b1..53f5d6bedc 100644 --- a/core/src/main/java/hudson/tasks/ArtifactArchiver.java +++ b/core/src/main/java/hudson/tasks/ArtifactArchiver.java @@ -296,6 +296,9 @@ public class ArtifactArchiver extends Recorder implements SimpleBuildStep { * Performs on-the-fly validation on the file mask wildcard. */ public FormValidation doCheckArtifacts(@AncestorInPath AbstractProject project, @QueryParameter String value) throws IOException { + if (project == null) { + return FormValidation.ok(); + } return FilePath.validateFileMask(project.getSomeWorkspace(),value); } diff --git a/core/src/main/java/hudson/tasks/Fingerprinter.java b/core/src/main/java/hudson/tasks/Fingerprinter.java index 7320838ec4..8c00b145b9 100644 --- a/core/src/main/java/hudson/tasks/Fingerprinter.java +++ b/core/src/main/java/hudson/tasks/Fingerprinter.java @@ -260,6 +260,9 @@ public class Fingerprinter extends Recorder implements Serializable, DependencyD } public FormValidation doCheckTargets(@AncestorInPath AbstractProject project, @QueryParameter String value) throws IOException { + if (project == null) { + return FormValidation.ok(); + } return FilePath.validateFileMask(project.getSomeWorkspace(),value); }