Merge pull request #336 from Jimilian/JENKINS_48155

JENKINS-48155: gerrit-trigger-plugin does not repsect dynamicTriggerConfiguration flag
jenkinsci · Dec 6, 2017 · afab9e9 · afab9e9
2 parents fde68b3 + 756a09e
commit afab9e9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/...main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTrigger.java b/...main/java/com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTrigger.java
@@ -1388,6 +1388,10 @@ public boolean isDynamicTriggerConfiguration() {
      */
     @DataBoundSetter
     public void setDynamicTriggerConfiguration(boolean dynamicTriggerConfiguration) {
+        if (!dynamicTriggerConfiguration) {
+            dynamicGerritProjects = Collections.emptyList();
+        }
+
         this.dynamicTriggerConfiguration = dynamicTriggerConfiguration;
     }
 

diff --git a/.../com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTriggerTimerTask.java b/.../com/sonyericsson/hudson/plugins/gerrit/trigger/hudsontrigger/GerritTriggerTimerTask.java
@@ -29,6 +29,7 @@
 import javax.annotation.Nonnull;
 
 import jenkins.model.Jenkins;
+import org.apache.commons.lang.StringUtils;
 
 /**
  * TimerTasks that are created from a GerritTrigger and periodically calls
@@ -59,6 +60,9 @@ public void run() {
         if (trigger == null) {
             return;
         }
+        if (StringUtils.isEmpty(trigger.getTriggerConfigURL())) {
+            return;
+        }
         trigger.updateTriggerConfigURL();
     }