Skip to content

Commit 7ea6b36

Browse files
committed
FindBugs
1 parent c77b341 commit 7ea6b36

3 files changed

Lines changed: 5 additions & 3 deletions

File tree

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
</pluginRepositories>
6464
<properties>
6565
<jenkins.version>1.642.3</jenkins.version>
66-
<workflow-step-api-plugin.version>2.11</workflow-step-api-plugin.version>
66+
<workflow-step-api-plugin.version>2.12-20170630.151937-1</workflow-step-api-plugin.version> <!-- TODO https://github.com/jenkinsci/workflow-step-api-plugin/pull/27 -->
6767
<workflow-cps-plugin.version>2.32</workflow-cps-plugin.version>
6868
<workflow-support-plugin.version>2.14</workflow-support-plugin.version>
6969
</properties>

src/main/java/org/jenkinsci/plugins/workflow/steps/CoreStep.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,8 @@ private <T extends Describable<T>,D extends Descriptor<T>> void populate(List<De
125125
}
126126

127127
@Override public String argumentsToString(Map<String, Object> namedArgs) {
128-
return super.argumentsToString(delegateArguments(namedArgs.get("delegate")));
128+
Map<String, Object> delegateArguments = delegateArguments(namedArgs.get("delegate"));
129+
return delegateArguments != null ? super.argumentsToString(delegateArguments) : null;
129130
}
130131

131132
@SuppressWarnings("unchecked")

src/main/java/org/jenkinsci/plugins/workflow/steps/CoreWrapperStep.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,8 @@ public Collection<BuildWrapperDescriptor> getApplicableDescriptors() {
162162
}
163163

164164
@Override public String argumentsToString(Map<String, Object> namedArgs) {
165-
return super.argumentsToString(CoreStep.DescriptorImpl.delegateArguments(namedArgs.get("delegate")));
165+
Map<String, Object> delegateArguments = CoreStep.DescriptorImpl.delegateArguments(namedArgs.get("delegate"));
166+
return delegateArguments != null ? super.argumentsToString(delegateArguments) : null;
166167
}
167168

168169
}

0 commit comments

Comments
 (0)