提交 176ce5f5 编写于 作者: J Jesse Glick

Have observed Slave.getNodeProperties returning null, which should not happen.

上级 b524e52e
......@@ -59,6 +59,7 @@ import java.util.Set;
import java.util.List;
import java.util.logging.Logger;
import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import jenkins.model.Jenkins;
import jenkins.util.io.OnMaster;
......@@ -397,7 +398,7 @@ public abstract class Node extends AbstractModelObject implements Reconfigurable
/**
* Gets the {@link NodeProperty} instances configured for this {@link Node}.
*/
public abstract DescribableList<NodeProperty<?>, NodePropertyDescriptor> getNodeProperties();
public abstract @Nonnull DescribableList<NodeProperty<?>, NodePropertyDescriptor> getNodeProperties();
// used in the Jelly script to expose descriptors
public List<NodePropertyDescriptor> getNodePropertyDescriptors() {
......
......@@ -230,6 +230,7 @@ public abstract class Slave extends Node implements Serializable {
}
public DescribableList<NodeProperty<?>, NodePropertyDescriptor> getNodeProperties() {
assert nodeProperties != null;
return nodeProperties;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册