diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index 67c1e2b825abd3d3409259d063d435bc55c8c5f5..babfe64003c188a3703f1baaf62f0f380bcdb8e4 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -750,7 +750,15 @@ public abstract class AbstractProject
,R extends A if(scm==null) return true; // no SCM + // Acquire lock for SCMTrigger so poll won't run while we checkout/update + SCMTrigger scmt = getTrigger(SCMTrigger.class); + boolean locked = false; try { + if (scmt!=null) { + scmt.getLock().lockInterruptibly(); + locked = true; + } + FilePath workspace = getWorkspace(); workspace.mkdirs(); @@ -759,6 +767,9 @@ public abstract class AbstractProject
,R extends A
listener.getLogger().println(Messages.AbstractProject_ScmAborted());
LOGGER.log(Level.INFO,build.toString()+" aborted",e);
return false;
+ } finally {
+ if (locked)
+ scmt.getLock().unlock();
}
}
diff --git a/test/src/test/java/hudson/triggers/SCMTriggerTest.java b/test/src/test/java/hudson/triggers/SCMTriggerTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..ff742e5899e90aec8432dcf9018d43d2db082d7d
--- /dev/null
+++ b/test/src/test/java/hudson/triggers/SCMTriggerTest.java
@@ -0,0 +1,89 @@
+/*
+ * The MIT License
+ *
+ * Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+package hudson.triggers;
+
+import hudson.FilePath;
+import hudson.Launcher;
+import hudson.model.AbstractBuild;
+import hudson.model.AbstractProject;
+import hudson.model.BuildListener;
+import hudson.model.Cause;
+import hudson.model.FreeStyleBuild;
+import hudson.model.FreeStyleProject;
+import hudson.model.Hudson;
+import hudson.model.TaskListener;
+import hudson.scm.NullSCM;
+import org.jvnet.hudson.test.Bug;
+import org.jvnet.hudson.test.HudsonTestCase;
+import java.io.File;
+import java.io.IOException;
+import java.util.concurrent.Future;
+
+/**
+ * @author Alan Harder
+ */
+public class SCMTriggerTest extends HudsonTestCase {
+ /**
+ * Make sure that SCMTrigger doesn't trigger another build when a build has just started,
+ * but not yet completed its SCM update.
+ */
+ @Bug(2671)
+ public void testSimultaneousPollAndBuild() throws Exception {
+ FreeStyleProject p = createFreeStyleProject();
+ final Object notifier = new Object();
+ p.setScm(new TestSCM(notifier));
+ SCMTrigger.DESCRIPTOR.synchronousPolling = true;
+ SCMTrigger trigger = new SCMTrigger("0 0 1 1 0");
+ p.addTrigger(trigger);
+ trigger.start(p, true);
+
+ Future