diff --git a/core/src/main/java/hudson/model/AbstractBuild.java b/core/src/main/java/hudson/model/AbstractBuild.java index c195d9855f7a2f7fddfbb57b607f919a581aa2ea..aec68e72efee334306e237b8c4e112f346c6e9bd 100644 --- a/core/src/main/java/hudson/model/AbstractBuild.java +++ b/core/src/main/java/hudson/model/AbstractBuild.java @@ -605,7 +605,7 @@ public abstract class AbstractBuild
,R extends Abs if (project.checkout(build, launcher,listener, changeLogFile)) { // check out succeeded SCM scm = project.getScm(); - for (SCMListener l : Jenkins.getInstance().getSCMListeners()) { + for (SCMListener l : SCMListener.all()) { try { l.onCheckout(build, scm, build.getWorkspace(), listener, changeLogFile, project.pollingBaseline); } catch (Exception e) { @@ -616,7 +616,7 @@ public abstract class AbstractBuild
,R extends Abs
build.scm = scm.createChangeLogParser();
build.changeSet = new WeakReference
- * Unless {@link SCMListener} is unregistered, it will never be a subject of GC.
- */
+ /** @deprecated Use {@link Extension} instead. */
+ @Deprecated
public final boolean unregister() {
- return Jenkins.getInstance().getSCMListeners().remove(this);
+ Jenkins j = Jenkins.getInstance();
+ if (j != null) {
+ return j.getSCMListeners().remove(this);
+ } else {
+ return false;
+ }
}
}
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
index 556660c495ff9f6db7f7f4cada4d29fa03eea1b3..139dc5501ce6c773faa37d7205dda7c91511740c 100644
--- a/core/src/main/java/jenkins/model/Jenkins.java
+++ b/core/src/main/java/jenkins/model/Jenkins.java
@@ -1220,9 +1220,8 @@ public class Jenkins extends AbstractCIBase implements DirectlyModifiableTopLeve
updateComputerList(AUTOMATIC_SLAVE_LAUNCH);
}
- /**
- * Gets all the installed {@link SCMListener}s.
- */
+ /** @deprecated Use {@link SCMListener#all} instead. */
+ @Deprecated
public CopyOnWriteList