提交 c595586f 编写于 作者: K Kohsuke Kawaguchi

[FIXED JENKINS-9412] Fixed possible NPE in

GlobalMatrixAuthorizationStrategy$DescriptorImpl.doCheckName
上级 74e35d8b
......@@ -55,6 +55,9 @@ Upcoming changes</a>
<!-- Record your changes in the trunk here. -->
<div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
<ul class=image>
<li class=bug>
Fixed NPE in <tt>GlobalMatrixAuthorizationStrategy.doCheckName</tt>
(<a href="http://issues.jenkins-ci.org/browse/JENKINS-9412">issue 9412</a>)
<li class=bug>
Fixed a <tt>ClassCastException</tt> caused by multiple loading of the same class in different classloaders.
(<a href="http://issues.jenkins-ci.org/browse/JENKINS-9017">issue 9017</a>)
......
......@@ -178,7 +178,7 @@ public class AuthorizationMatrixProperty extends JobProperty<Job<?, ?>> {
}
public FormValidation doCheckName(@AncestorInPath Job project, @QueryParameter String value) throws IOException, ServletException {
return GlobalMatrixAuthorizationStrategy.DESCRIPTOR.doCheckName(value, project, AbstractProject.CONFIGURE);
return GlobalMatrixAuthorizationStrategy.DESCRIPTOR.doCheckName_(value, project, AbstractProject.CONFIGURE);
}
}
......
......@@ -284,10 +284,10 @@ public class GlobalMatrixAuthorizationStrategy extends AuthorizationStrategy {
}
public FormValidation doCheckName(@QueryParameter String value ) throws IOException, ServletException {
return doCheckName(value, Hudson.getInstance(), Hudson.ADMINISTER);
return doCheckName_(value, Hudson.getInstance(), Hudson.ADMINISTER);
}
public FormValidation doCheckName(String value, AccessControlled subject, Permission permission) throws IOException, ServletException {
public FormValidation doCheckName_(String value, AccessControlled subject, Permission permission) throws IOException, ServletException {
if(!subject.hasPermission(permission)) return FormValidation.ok(); // can't check
final String v = value.substring(1,value.length()-1);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册