Skip to content

Commit 7c59f48

Browse files
Merge pull request #168 from jglick/NPE
NPE fix from `JiraTestDataPublisher.getJobName`
2 parents 87b530e + 10a42af commit 7c59f48

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

src/main/java/org/jenkinsci/plugins/JiraTestResultReporter/JiraTestDataPublisher.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,9 @@ public List<String> getAttachments(String className, String name) {
152152
* Getter for the project associated with this publisher
153153
* @return
154154
*/
155-
private AbstractProject getJobName() {
156-
return Stapler.getCurrentRequest().findAncestorObject(AbstractProject.class);
155+
private @CheckForNull AbstractProject getJobName() {
156+
StaplerRequest currentRequest = Stapler.getCurrentRequest();
157+
return currentRequest != null ? currentRequest.findAncestorObject(AbstractProject.class) : null;
157158
}
158159

159160
private boolean pipelineInvocation = false;

src/main/java/org/jenkinsci/plugins/JiraTestResultReporter/JobConfigMapping.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.google.gson.GsonBuilder;
2525
import com.google.gson.stream.JsonReader;
2626
import com.google.gson.stream.JsonWriter;
27+
import edu.umd.cs.findbugs.annotations.CheckForNull;
2728
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
2829
import hudson.model.Job;
2930
import java.io.FileInputStream;
@@ -400,7 +401,10 @@ public synchronized void saveConfig(Job project, JobConfigEntry entry) {
400401
save(project, entry);
401402
}
402403

403-
private JobConfigEntry getJobConfigEntry(Job project) {
404+
private JobConfigEntry getJobConfigEntry(@CheckForNull Job project) {
405+
if (project == null) {
406+
return null;
407+
}
404408
if (!configMap.containsKey(project.getFullName())) {
405409
JobConfigEntry entry = load(project);
406410
if (entry != null) {

0 commit comments

Comments
 (0)