Merge pull request #22 from synopsys-arc-oss/JENKINS-24853

[FIXED JENKINS-24853] - Handle null multiConfigOptions
jenkinsci · Sep 29, 2014 · c061810 · c061810
2 parents 6f33735 + 41037bb
commit c061810
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/main/java/com/cloudbees/jenkins/plugins/customtools/CustomToolInstallWrapper.java b/src/main/java/com/cloudbees/jenkins/plugins/customtools/CustomToolInstallWrapper.java
@@ -99,7 +99,7 @@ public String toString() {
     }
 
     private @Nonnull SelectedTool[] selectedTools = new SelectedTool[0];
-    private final @Nonnull MulticonfigWrapperOptions multiconfigOptions;    
+    private final @CheckForNull MulticonfigWrapperOptions multiconfigOptions;    
     private final boolean convertHomesToUppercase;
 
     @DataBoundConstructor
@@ -162,7 +162,7 @@ public Launcher decorateLauncher(AbstractBuild build, final Launcher launcher,
         // Handle multi-configuration build
         if (build instanceof MatrixBuild) {  
             CustomToolsLogger.logMessage(listener, "Skipping installation of tools at the master job");
-            if (multiconfigOptions.isSkipMasterInstallation()) {
+            if (getMulticonfigOptions().isSkipMasterInstallation()) {
                 return launcher;
             }
         }
@@ -325,7 +325,7 @@ public boolean hasMulticonfigOptions() {
      * @since 0.3
      */
     public @Nonnull MulticonfigWrapperOptions getMulticonfigOptions() {
-        return multiconfigOptions;
+        return multiconfigOptions != null ? multiconfigOptions : MulticonfigWrapperOptions.DEFAULT;
     }  
 
     @Extension