Merge pull request #83 from anenviousguest/master

[JENKINS-41980] SCM triggering should also be suppressed for branch events
jenkinsci · Feb 13, 2017 · a8ae07c · a8ae07c
2 parents 717536b + d7334e5
commit a8ae07c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/jenkins/branch/NoTriggerBranchProperty.java b/src/main/java/jenkins/branch/NoTriggerBranchProperty.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) {

diff --git a/src/main/java/jenkins/branch/NoTriggerOrganizationFolderProperty.java b/src/main/java/jenkins/branch/NoTriggerOrganizationFolderProperty.java
@@ -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;