Skip to content

Commit

Permalink
Fixed NPE when setting selector explicitly to null from groovy
Browse files Browse the repository at this point in the history
  • Loading branch information
cconnert committed Aug 10, 2023
1 parent 3a6e680 commit 0a8c964
Show file tree
Hide file tree
Showing 2 changed files with 47 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/main/java/hudson/plugins/copyartifact/CopyArtifact.java
Original file line number Diff line number Diff line change
Expand Up @@ -161,9 +161,6 @@ public CopyArtifact(String projectName, String parameters, BuildSelector selecto
setFilter(filter);
setTarget(target);
setExcludes(excludes);
if (selector == null) {
selector = DEFAULT_BUILD_SELECTOR;
}
setSelector(selector);
setFlatten(flatten);
setOptional(optional);
Expand Down Expand Up @@ -227,6 +224,9 @@ public void setExcludes(String excludes) {

@DataBoundSetter
public void setSelector(@NonNull BuildSelector selector) {
if (selector == null) {
selector = DEFAULT_BUILD_SELECTOR;
}
this.selector = selector;
}

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
/*
* The MIT License
*
* Copyright (c) 2019, Chad Gilman
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package hudson.plugins.copyartifact;

import org.junit.Rule;
import org.junit.Test;
import org.jvnet.hudson.test.JenkinsRule;

public class LastStableBuildSelectorTest {

@Rule
public final JenkinsRule rule = new JenkinsRule();

@Test
public void testNullSettingSelectorNullFallsBackToDefaultAkaStableSelector() throws Exception {
CopyArtifact copyArtifact = new CopyArtifact("dummy");
copyArtifact.setSelector(null);
BuildSelector s = copyArtifact.getSelector();
org.junit.Assert.assertNotNull(s);
org.junit.Assert.assertTrue(s instanceof StatusBuildSelector);
org.junit.Assert.assertTrue(((StatusBuildSelector)s).isStable());
}
}

0 comments on commit 0a8c964

Please sign in to comment.