Merge pull request #4975 from vsebe/jenkins.extra.src

Fix NPE for extra_getsource_options
eclipse-openj9 · Mar 4, 2019 · 0b1db0c · 0b1db0c
2 parents c19519c + 34b6601
commit 0b1db0c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/buildenv/jenkins/common/variables-functions b/buildenv/jenkins/common/variables-functions
@@ -894,7 +894,7 @@ def set_build_extra_options(build_specs=null) {
                         //      EXTRA_CONFIGURE_OPTIONS_JDK<release>_<spec>
                         //      EXTRA_MAKE_OPTIONS_JDK<release>_<spec>
                         def extraOptions = params."${it}_JDK${release}_${spec}"
-                        if (!extraOptions) {
+                        if (!extraOptions && VARIABLES."${spec}") {
                             extraOptions = get_value(VARIABLES."${spec}"."${it.toLowerCase()}", release)
                         }