Skip to content
Permalink
Browse files
Merge pull request #83 from anenviousguest/master
[JENKINS-41980] SCM triggering should also be suppressed for branch events
  • Loading branch information
stephenc committed Feb 13, 2017
2 parents 717536b + d7334e5 commit a8ae07cbc48c205a0c8a4c507ff20fbb7075411d
Showing with 2 additions and 2 deletions.
  1. +1 −1 src/main/java/jenkins/branch/NoTriggerBranchProperty.java
  2. +1 −1 src/main/java/jenkins/branch/NoTriggerOrganizationFolderProperty.java
@@ -69,7 +69,7 @@ public boolean shouldSchedule(Queue.Task p, List<Action> actions) {
for (Action action : actions) {
if (action instanceof CauseAction) {
for (Cause c : ((CauseAction) action).getCauses()) {
if (c instanceof BranchIndexingCause) {
if (c instanceof BranchIndexingCause || c instanceof BranchEventCause) {
if (p instanceof Job) {
Job<?,?> j = (Job) p;
if (j.getParent() instanceof MultiBranchProject) {
@@ -87,7 +87,7 @@ public boolean shouldSchedule(Queue.Task p, List<Action> actions) {
for (Action action : actions) {
if (action instanceof CauseAction) {
for (Cause c : ((CauseAction) action).getCauses()) {
if (c instanceof BranchIndexingCause) {
if (c instanceof BranchIndexingCause || c instanceof BranchEventCause) {
if (p instanceof Job) {
Job<?,?> j = (Job) p;

0 comments on commit a8ae07c

Please sign in to comment.