[FIXED JENKINS-13215] NullPointerException when Category have value :…

… not selected.
jenkinsci · Apr 1, 2012 · b8b2540 · b8b2540
1 parent 186afee
commit b8b2540
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/src/main/java/hudson/plugins/mantis/MantisIssueRegister.java b/src/main/java/hudson/plugins/mantis/MantisIssueRegister.java
@@ -68,10 +68,14 @@ public boolean perform(AbstractBuild<?, ?> build, Launcher launcher, BuildListen
         }
 
         int no;
-        MantisIssue issue = createIssue(build);
+        MantisIssue issue = createIssue(build, listener);
+        if (issue == null) {
+            Utility.log(logger, "skipping file a ticket ...");
+            return true;
+        }
         try {
             no = site.addIssue(issue);
-            Utility.log(logger, "file ticket #" + no + "(" + getIssueURL(site, no) + ")");
+            Utility.log(logger, "file a ticket #" + no + "(" + getIssueURL(site, no) + ")");
         } catch (MantisHandlingException e) {
             Utility.log(logger, e.toString());
             build.setResult(Result.FAILURE);
@@ -97,11 +101,13 @@ private String getIssueURL(MantisSite site, int no) {
         return site.getIssueLink(no);
     }
 
-    private MantisIssue createIssue(AbstractBuild<?, ?> build) throws IOException, InterruptedException {
+    private MantisIssue createIssue(AbstractBuild<?, ?> build, BuildListener listener) 
+            throws IOException, InterruptedException {
         MantisProjectProperty mpp = getMantisProjectProperty(build);
         int projectId = mpp.getProjectId();
         String categoryName = mpp.getCategory();
         if (projectId == MantisProject.NONE || MantisCategory.None.equals(categoryName)) {
+            Utility.log(listener.getLogger(), "Neither project nor category selected.");
             return null;
         }
 

diff --git a/src/main/java/hudson/plugins/mantis/soap/mantis110/MantisSessionImpl.java b/src/main/java/hudson/plugins/mantis/soap/mantis110/MantisSessionImpl.java
@@ -131,6 +131,9 @@ public List<MantisCategory> getCategories(int projectId) throws MantisHandlingEx
     }
 
     public int addIssue(MantisIssue issue) throws MantisHandlingException {
+        if (issue == null) {
+            throw new MantisHandlingException("issue should not be null.");
+        }
         IssueData data = new IssueData();
         MantisProject project = issue.getProject();
         if (project == null) {

diff --git a/src/main/java/hudson/plugins/mantis/soap/mantis120/MantisSessionImpl.java b/src/main/java/hudson/plugins/mantis/soap/mantis120/MantisSessionImpl.java
@@ -130,6 +130,9 @@ public List<MantisCategory> getCategories(int projectId) throws MantisHandlingEx
     }
 
     public int addIssue(MantisIssue issue) throws MantisHandlingException {
+        if (issue == null) {
+            throw new MantisHandlingException("issue should not be null.");
+        }
         IssueData data = new IssueData();
         MantisProject project = issue.getProject();
         if (project == null) {