Skip to content

Commit 8ee0248

Browse files
authored
Merge pull request #192 from chcg/issue_190
avoid some NPE on generateSnippet
2 parents 860146f + 382f093 commit 8ee0248

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

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

+6-2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import com.atlassian.jira.rest.client.internal.async.AsynchronousHttpClientFactory;
3737
import com.atlassian.jira.rest.client.internal.async.AsynchronousJiraRestClientFactory;
3838
import edu.umd.cs.findbugs.annotations.CheckForNull;
39+
import edu.umd.cs.findbugs.annotations.NonNull;
3940
import hudson.EnvVars;
4041
import hudson.Extension;
4142
import hudson.FilePath;
@@ -69,7 +70,6 @@
6970
import java.util.HashMap;
7071
import java.util.List;
7172
import java.util.Map;
72-
import javax.annotation.Nonnull;
7373
import jenkins.model.Jenkins;
7474
import net.sf.json.JSONObject;
7575
import org.jenkinsci.Symbol;
@@ -253,7 +253,7 @@ public JiraTestDataPublisher(
253253
*/
254254
@Override
255255
public TestResultAction.Data contributeTestData(
256-
Run<?, ?> run, @Nonnull FilePath workspace, Launcher launcher, TaskListener listener, TestResult testResult)
256+
Run<?, ?> run, @NonNull FilePath workspace, Launcher launcher, TaskListener listener, TestResult testResult)
257257
throws IOException, InterruptedException {
258258

259259
EnvVars envVars = run.getEnvironment(listener);
@@ -799,6 +799,10 @@ public FormValidation validateFieldConfigs(String jsonForm) throws FormException
799799
}
800800
}
801801

802+
if (jiraPublisherJSON == null) {
803+
return FormValidation.error("jiraPublisherJSON is null.\n");
804+
}
805+
802806
// constructing the objects from json
803807
List<AbstractFields> configs =
804808
newInstancesFromHeteroList(req, jiraPublisherJSON.get("configs"), getListDescriptors());

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

+3
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,9 @@ public synchronized void saveConfig(
394394
* Method for setting the last configuration made for a project
395395
*/
396396
public synchronized void saveConfig(Job project, JobConfigEntry entry) {
397+
if (project == null) {
398+
return;
399+
}
397400
if (entry instanceof JobConfigEntryBuilder) {
398401
entry = ((JobConfigEntryBuilder) entry).build();
399402
}

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

+4
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,10 @@ private HashMap<String, String> loadMap(Job job) {
154154
* @param job
155155
*/
156156
public void register(Job job) {
157+
if (job == null) {
158+
return;
159+
}
160+
157161
if (job instanceof MatrixProject) {
158162
for (Job child : ((MatrixProject) job).getAllJobs()) {
159163
if (child instanceof MatrixProject) {

0 commit comments

Comments
 (0)