Skip to content
Permalink
Browse files

[FIXED JENKINS-24853] - Handle null multiConfigOptions

Signed-off-by: Oleg Nenashev <o.v.nenashev@gmail.com>
  • Loading branch information...
oleg-nenashev committed Sep 29, 2014
1 parent 8b09f8b commit 41037bb1332f319860561d6cee4126927e244407
@@ -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;
}
}
@@ -323,7 +323,7 @@ public boolean hasMulticonfigOptions() {
* @since 0.3
*/
public @Nonnull MulticonfigWrapperOptions getMulticonfigOptions() {
return multiconfigOptions;
return multiconfigOptions != null ? multiconfigOptions : MulticonfigWrapperOptions.DEFAULT;
}

@Extension

0 comments on commit 41037bb

Please sign in to comment.
You can’t perform that action at this time.