[JENKINS-45471] Not add null values to the list (#114)

* [JENKINS-45471] Not add null values to the list * [JENKINS-45471] Add a logger in the else
jenkinsci · Jul 12, 2017 · 59e30a2 · 59e30a2
1 parent 59a3463
commit 59e30a2
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/main/java/hudson/plugins/parameterizedtrigger/BuildTriggerConfig.java b/src/main/java/hudson/plugins/parameterizedtrigger/BuildTriggerConfig.java
@@ -387,6 +387,7 @@ public List<Future<AbstractBuild>> perform(AbstractBuild<?, ?> build, Launcher l
 
         try {
 			if (condition.isMet(build.getResult())) {
+                Future future = null;
                 List<Future<AbstractBuild>> futures = new ArrayList<Future<AbstractBuild>>();
 
                 for (List<AbstractBuildParameters> addConfigs : getDynamicBuildParameters(build, listener)) {
@@ -395,8 +396,13 @@ public List<Future<AbstractBuild>> perform(AbstractBuild<?, ?> build, Launcher l
                             build, listener);
                     for (Job project : getJobs(build.getRootBuild().getProject().getParent(), env)) {
                         List<Action> list = getBuildActions(actions, project);
-
-                        futures.add(schedule(build, project, list, listener));
+                        //Future can be null as schedule can return null
+                        future = schedule(build, project, list, listener);
+                        if (future != null) {
+                            futures.add(future);
+                        } else {
+                            LOGGER.log(Level.FINE, "The schedule for project {0} and build {1} failed due either security reasons or the trigger is not compatible with un-parameterized jobs", new Object[]{project.getFullName(), build.number});
+                        }
                     }
                 }