Merge pull request #2 from brenarth/JENKINS-34922

Check for null result when resolving incidents
jenkinsci · Nov 29, 2016 · 6207752 · 6207752
2 parents c795510 + 0675020
commit 6207752
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/pagerduty/PagerDutyTrigger.java b/src/main/java/org/jenkinsci/plugins/pagerduty/PagerDutyTrigger.java
@@ -222,7 +222,11 @@ private boolean resolveIncident(PagerDuty pagerDuty, PrintStream logger) {
                 .build();
         try{
             NotifyResult result = pagerDuty.notify(resolution);
-            logger.println("Finished resolving - " + result.status());
+            if (result != null) {
+                logger.println("Finished resolving - " + result.status());
+            } else {
+                logger.println("Attempt to resolve the incident returned null - Incident may already be closed or may not exist.");
+            }
         } catch (IOException e){
             logger.println("Error while trying to resolve ");
             logger.println(e.getMessage());
@@ -298,4 +302,4 @@ public String getDisplayName() {
         }
 
     }
-}
+}