diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index bcd2c18efb..a2330aa256 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -43,6 +43,11 @@ import java.util.Vector; */ public abstract class AbstractProject

,R extends AbstractBuild> extends Job implements BuildableItem { + /** + * {@link SCM} associated with the project. + * To allow derived classes to link {@link SCM} config to elsewhere, + * access to this variable should always go through {@link #getScm()}. + */ private SCM scm = new NullSCM(); /** @@ -385,6 +390,7 @@ public abstract class AbstractProject

,R extends A } public boolean checkout(AbstractBuild build, Launcher launcher, BuildListener listener, File changelogFile) throws IOException { + SCM scm = getScm(); if(scm==null) return true; // no SCM @@ -407,6 +413,7 @@ public abstract class AbstractProject

,R extends A * a build and polling, as both touches the workspace. */ public boolean pollSCMChanges( TaskListener listener ) { + SCM scm = getScm(); if(scm==null) { listener.getLogger().println("No SCM"); return false; @@ -663,7 +670,7 @@ public abstract class AbstractProject

,R extends A } RSS.forwardToRss( - getDisplayName()+' '+scm.getDescriptor().getDisplayName()+" changes", + getDisplayName()+' '+getScm().getDescriptor().getDisplayName()+" changes", getUrl()+"changes", entries, new FeedAdapter() { public String getEntryTitle(FeedItem item) {