Skip to content
Permalink
Browse files

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

[FIXED JENKINS-24853] - Handle null multiConfigOptions
  • Loading branch information...
oleg-nenashev committed Sep 29, 2014
2 parents 6f33735 + 41037bb commit c061810db486bb7e5a4d41bad1a041f43bf05682
@@ -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

0 comments on commit c061810

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