From c41c278bc45ecfc940d85441f2bdc1362ca38bb3 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sun, 20 Jul 2008 16:33:46 +0000 Subject: [PATCH] [FIXED HUDSON-2089] I believe I fixed this NPE now in 1.236. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@10882 71c3de6d-444a-0410-be80-ed276b4c234a --- .../hudson/model/BuildAuthorizationToken.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/hudson/model/BuildAuthorizationToken.java b/core/src/main/java/hudson/model/BuildAuthorizationToken.java index d3882b88a2..cd90d9200e 100644 --- a/core/src/main/java/hudson/model/BuildAuthorizationToken.java +++ b/core/src/main/java/hudson/model/BuildAuthorizationToken.java @@ -2,6 +2,7 @@ package hudson.model; import com.thoughtworks.xstream.converters.basic.AbstractBasicConverter; import hudson.Util; +import hudson.security.ACL; import org.kohsuke.stapler.StaplerRequest; import org.kohsuke.stapler.StaplerResponse; @@ -12,6 +13,9 @@ import java.io.IOException; * * @author Kohsuke Kawaguchi * @see BuildableItem + * @deprecated + * Use {@link ACL} and {@link AbstractProject#BUILD}. This code is only here + * for the backward compatibility. */ public final class BuildAuthorizationToken { private final String token; @@ -21,10 +25,13 @@ public final class BuildAuthorizationToken { } public static BuildAuthorizationToken create(StaplerRequest req) { - if (req.getParameter("pseudoRemoteTrigger") != null) - return new BuildAuthorizationToken(Util.fixEmpty(req.getParameter("authToken"))); - else - return null; + if (req.getParameter("pseudoRemoteTrigger") != null) { + String token = Util.fixEmpty(req.getParameter("authToken")); + if(token!=null) + return new BuildAuthorizationToken(token); + } + + return null; } public static void checkPermission(AbstractProject project, BuildAuthorizationToken token, StaplerRequest req, StaplerResponse rsp) throws IOException {