Merge pull request #93 from alvarolobato/master

* upstream/pr/93: [JENKINS-33859] NPE Error updating JIRA issues - Added NP check after retrieving the issue.
jenkinsci · May 3, 2016 · 9dd3bae · 9dd3bae
2 parents c40a6c2 + 8c914f1
commit 9dd3bae
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/src/main/java/hudson/plugins/jira/Updater.java b/src/main/java/hudson/plugins/jira/Updater.java
@@ -18,6 +18,7 @@
 import java.util.logging.Logger;
 import org.apache.commons.lang.StringUtils;
 import com.atlassian.jira.rest.client.api.RestClientException;
+import com.atlassian.jira.rest.client.api.domain.Issue;
 import com.google.common.base.Strings;
 import hudson.Util;
 import hudson.model.Hudson;
@@ -204,8 +205,16 @@ private static List<JiraIssue> getJiraIssues(
                 }
                 continue;   // token looked like a JIRA issue but it's actually not.
             }
-
-            issues.add(new JiraIssue(session.getIssue(id)));
+
+            Issue issue = session.getIssue(id);
+            if (issue == null) {
+                if (debug) {
+                    logger.println(id + " issue doesn't exist in JIRA");
+                }
+                continue;
+            }
+
+            issues.add(new JiraIssue(issue));
         }
         return issues;
     }