Merge pull request #168 from jglick/NPE

NPE fix from `JiraTestDataPublisher.getJobName`
jenkinsci · Oct 23, 2024 · 7c59f48 · 7c59f48
2 parents 87b530e + 10a42af
commit 7c59f48
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/JiraTestResultReporter/JiraTestDataPublisher.java b/src/main/java/org/jenkinsci/plugins/JiraTestResultReporter/JiraTestDataPublisher.java
@@ -152,8 +152,9 @@ public List<String> getAttachments(String className, String name) {
      * Getter for the project associated with this publisher
      * @return
      */
-    private AbstractProject getJobName() {
-        return Stapler.getCurrentRequest().findAncestorObject(AbstractProject.class);
+    private @CheckForNull AbstractProject getJobName() {
+        StaplerRequest currentRequest = Stapler.getCurrentRequest();
+        return currentRequest != null ? currentRequest.findAncestorObject(AbstractProject.class) : null;
     }
 
     private boolean pipelineInvocation = false;

diff --git a/src/main/java/org/jenkinsci/plugins/JiraTestResultReporter/JobConfigMapping.java b/src/main/java/org/jenkinsci/plugins/JiraTestResultReporter/JobConfigMapping.java
@@ -24,6 +24,7 @@
 import com.google.gson.GsonBuilder;
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
+import edu.umd.cs.findbugs.annotations.CheckForNull;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.model.Job;
 import java.io.FileInputStream;
@@ -400,7 +401,10 @@ public synchronized void saveConfig(Job project, JobConfigEntry entry) {
         save(project, entry);
     }
 
-    private JobConfigEntry getJobConfigEntry(Job project) {
+    private JobConfigEntry getJobConfigEntry(@CheckForNull Job project) {
+        if (project == null) {
+            return null;
+        }
         if (!configMap.containsKey(project.getFullName())) {
             JobConfigEntry entry = load(project);
             if (entry != null) {