提交 5a435918 编写于 作者: J Jesse Glick

Skip NullSCM since we are returning a collection anyway.

上级 d843675d
......@@ -29,6 +29,7 @@ import hudson.model.Item;
import hudson.model.Job;
import hudson.model.TaskListener;
import hudson.model.queue.QueueTaskFuture;
import hudson.scm.NullSCM;
import hudson.scm.PollingResult;
import hudson.scm.SCM;
import hudson.triggers.SCMTrigger;
......@@ -127,7 +128,7 @@ public interface SCMTriggerItem {
}
public static @Nonnull Collection<? extends SCM> resolveMultiScmIfConfigured(@CheckForNull SCM scm) {
if (scm == null) {
if (scm == null || scm instanceof NullSCM) {
return Collections.emptySet();
} else if (scm.getClass().getName().equals("org.jenkinsci.plugins.multiplescms.MultiSCM")) {
try {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册