提交 d304d19f 编写于 作者: K kohsuke

fixed an NPE from Jelly below:

java.lang.NullPointerException
        at org.apache.commons.jexl.parser.ASTAddNode.value(ASTAddNode.java:116)
        at org.apache.commons.jexl.parser.ASTExpression.value(ASTExpression.java:53)
        at org.apache.commons.jexl.parser.ASTMethod.execute(ASTMethod.java:81)
        at org.apache.commons.jexl.parser.ASTReference.execute(ASTReference.java:82)
        at org.apache.commons.jexl.parser.ASTReference.value(ASTReference.java:56)
        at org.apache.commons.jexl.parser.ASTReferenceExpression.value(ASTReferenceExpression.java:50)
        at org.apache.commons.jexl.ExpressionImpl.evaluate(ExpressionImpl.java:79)
        at org.apache.commons.jelly.expression.jexl.JexlExpression.evaluate(JexlExpression.java:69)
        at org.apache.commons.jelly.tags.core.SetTag.doTag(SetTag.java:84)
        at org.apache.commons.jelly.impl.TagScript.run(TagScript.java:262)
        at org.apache.commons.jelly.impl.ScriptBlock.run(ScriptBlock.java:95)
        at org.apache.commons.jelly.TagSupport.invokeBody(TagSupport.java:186)
        at org.apache.commons.jelly.tags.core.JellyTag.doTag(JellyTag.java:45)
        at org.apache.commons.jelly.impl.TagScript.run(TagScript.java:262)
        at org.apache.commons.jelly.impl.DynamicTag.doTag(DynamicTag.java:80)
        at org.apache.commons.jelly.impl.TagScript.run(TagScript.java:262)
        at org.apache.commons.jelly.impl.ScriptBlock.run(ScriptBlock.java:95)
        at org.apache.commons.jelly.TagSupport.invokeBody(TagSupport.java:186)
        at org.apache.commons.jelly.tags.core.WhenTag.doTag(WhenTag.java:46)
        at org.apache.commons.jelly.impl.TagScript.run(TagScript.java:262)
        at org.apache.commons.jelly.impl.ScriptBlock.run(ScriptBlock.java:95)
        at org.apache.commons.jelly.TagSupport.invokeBody(TagSupport.java:186)
        at org.apache.commons.jelly.tags.core.ChooseTag.doTag(ChooseTag.java:38)
        at org.apache.commons.jelly.impl.TagScript.run(TagScript.java:262)
        at org.apache.commons.jelly.impl.ScriptBlock.run(ScriptBlock.java:95)
        at org.apache.commons.jelly.TagSupport.invokeBody(TagSupport.java:186)
        at org.apache.commons.jelly.tags.core.ForEachTag.doTag(ForEachTag.java:150)
        at org.apache.commons.jelly.impl.TagScript.run(TagScript.java:262)
        at org.apache.commons.jelly.impl.ScriptBlock.run(ScriptBlock.java:95)
        at org.apache.commons.jelly.TagSupport.invokeBody(TagSupport.java:186)
        at org.apache.commons.jelly.tags.core.JellyTag.doTag(JellyTag.java:45)
        at org.apache.commons.jelly.impl.TagScript.run(TagScript.java:262)
        at org.apache.commons.jelly.impl.DynamicTag.doTag(DynamicTag.java:80)
        at org.apache.commons.jelly.impl.TagScript.run(TagScript.java:262)
        at org.apache.commons.jelly.impl.ScriptBlock.run(ScriptBlock.java:95)
        at org.apache.commons.jelly.TagSupport.invokeBody(TagSupport.java:186)
        at org.apache.commons.jelly.tags.core.OtherwiseTag.doTag(OtherwiseTag.java:41)
        at org.apache.commons.jelly.impl.TagScript.run(TagScript.java:262)
        at org.apache.commons.jelly.impl.ScriptBlock.run(ScriptBlock.java:95)
        at org.apache.commons.jelly.TagSupport.invokeBody(TagSupport.java:186)
        at org.apache.commons.jelly.tags.core.ChooseTag.doTag(ChooseTag.java:38)
        at org.apache.commons.jelly.impl.TagScript.run(TagScript.java:262)
        at org.apache.commons.jelly.impl.ScriptBlock.run(ScriptBlock.java:95)
        at org.apache.commons.jelly.TagSupport.invokeBody(TagSupport.java:186)
        at org.apache.commons.jelly.impl.StaticTag.doTag(StaticTag.java:65)
        at org.apache.commons.jelly.impl.StaticTagScript.run(StaticTagScript.java:112)
        at org.apache.commons.jelly.impl.ScriptBlock.run(ScriptBlock.java:95)
        at org.apache.commons.jelly.TagSupport.invokeBody(TagSupport.java:186)
        at org.apache.commons.jelly.tags.core.ForEachTag.doTag(ForEachTag.java:150)
        at org.apache.commons.jelly.impl.TagScript.run(TagScript.java:262)
        at org.apache.commons.jelly.impl.ScriptBlock.run(ScriptBlock.java:95)
        at org.apache.commons.jelly.TagSupport.invokeBody(TagSupport.java:186)
        at org.apache.commons.jelly.impl.StaticTag.doTag(StaticTag.java:65)
        at org.apache.commons.jelly.impl.StaticTagScript.run(StaticTagScript.java:112)
        at org.apache.commons.jelly.impl.ScriptBlock.run(ScriptBlock.java:95)
        at org.apache.commons.jelly.TagSupport.invokeBody(TagSupport.java:186)
        at org.apache.commons.jelly.tags.core.IfTag.doTag(IfTag.java:42)
        at org.apache.commons.jelly.impl.TagScript.run(TagScript.java:262)
        at org.apache.commons.jelly.impl.ScriptBlock.run(ScriptBlock.java:95)
        at org.apache.commons.jelly.tags.define.InvokeBodyTag.doTag(InvokeBodyTag.java:91)


git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@1801 71c3de6d-444a-0410-be80-ed276b4c234a
上级 8269b0be
......@@ -296,4 +296,9 @@ public class Functions {
}
return null;
}
public static String appendSpaceIfNotNull(String n) {
if(n==null) return null;
else return n+' ';
}
}
......@@ -6,7 +6,7 @@
<%@ attribute name="number" type="java.lang.Integer" required="true" %>
-->
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
<j:set var="jobName_" value="${h.ifThenElse(jobName!=null,jobName+' ',null)}"/>
<j:set var="jobName_" value="${h.appendSpaceIfNotNull(jobName)}"/>
<j:choose>
<j:when test="${job==null}">
${jobName_}#<!-- -->${number}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册