Skip to content
Permalink
Browse files
Protect from race condition in Triggers
[FIXED JENKINS-29790] [FIXED JENKINS-29945]
  • Loading branch information
KostyaSha committed Aug 21, 2015
1 parent a2ba196 commit 79c0bbf76680c8491e601be76d062299b7170971
@@ -2,6 +2,7 @@
* The MIT License
*
* Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Brian Westrich, Jean-Baptiste Quenot, id:cactusman
* 2015 Kanstantsin Shautsou
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -24,6 +25,7 @@
package hudson.triggers;

import antlr.ANTLRException;
import com.google.common.base.Preconditions;
import hudson.Extension;
import hudson.Util;
import hudson.console.AnnotatedLargeText;
@@ -117,6 +119,10 @@ public boolean isIgnorePostCommitHooks() {

@Override
public void run() {
if (job == null) {
return;
}

run(null);
}

@@ -128,6 +134,10 @@ public void run() {
* @since 1.375
*/
public void run(Action[] additionalActions) {
if (job == null) {
return;
}

DescriptorImpl d = getDescriptor();

LOGGER.fine("Scheduling a polling for "+job);
@@ -152,6 +162,10 @@ public DescriptorImpl getDescriptor() {

@Override
public Collection<? extends Action> getProjectActions() {
if (job == null) {
return Collections.emptyList();
}

return Collections.singleton(new SCMAction());
}

@@ -457,10 +471,12 @@ public void writeLogTo(XMLOutput out) throws IOException {
private Action[] additionalActions;

public Runner() {
additionalActions = new Action[0];
this(null);
}

public Runner(Action[] actions) {
Preconditions.checkNotNull(job, "Runner can't be instantiated when job is null");

if (actions == null) {
additionalActions = new Action[0];
} else {
@@ -532,6 +548,10 @@ private boolean runPolling() {
}

public void run() {
if (job == null) {
return;
}

String threadName = Thread.currentThread().getName();
Thread.currentThread().setName("SCM polling for "+job);
try {
@@ -2,6 +2,7 @@
* The MIT License
*
* Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Jean-Baptiste Quenot, Martin Eigenbrodt
* 2015 Kanstantsin Shautsou
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
@@ -52,6 +53,10 @@ public TimerTrigger(String spec) throws ANTLRException {

@Override
public void run() {
if (job == null) {
return;
}

job.scheduleBuild(0, new TimerTriggerCause());
}

@@ -2,7 +2,8 @@
* The MIT License
*
* Copyright (c) 2004-2009, Sun Microsystems, Inc., Kohsuke Kawaguchi, Brian Westrich, Jean-Baptiste Quenot, Stephen Connolly, Tom Huybrechts
*
* 2015 Kanstantsin Shautsou
*
* 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
@@ -149,6 +150,7 @@ public TriggerDescriptor getDescriptor() {

protected final String spec;
protected transient CronTabList tabs;
@CheckForNull
protected transient J job;

/**
@@ -0,0 +1,42 @@
/*
* The MIT License
*
* Copyright (c) 2015 Kanstantsin Shautsou
*
* 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 org.junit.Test;
import org.jvnet.hudson.test.Issue;

/**
* @author Kanstantsin Shautsou
*/
public class SCMTriggerTest {
@Issue({"JENKINS-29790", "JENKINS-29945"})
@Test
public void testNoNPE() throws Exception {
final SCMTrigger scmTrigger = new SCMTrigger("");

scmTrigger.run();
scmTrigger.run(null);
scmTrigger.getProjectActions();
}
}
@@ -0,0 +1,39 @@
/*
* The MIT License
*
* Copyright (c) 2015 Kanstantsin Shautsou
*
* 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 antlr.ANTLRException;
import org.junit.Test;
import org.jvnet.hudson.test.Issue;

/**
* @author Kanstantsin Shautsou
*/
public class TimerTriggerTest {
@Issue("JENKINS-29790")
@Test
public void testNoNPE() throws ANTLRException {
new TimerTrigger("").run();
}
}

0 comments on commit 79c0bbf

Please sign in to comment.