Custom message should handle all results by default

jenkinsci · Dec 17, 2018 · f3f0bdd · f3f0bdd
1 parent 8cde8f5
commit f3f0bdd
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/java/jenkins/plugins/slack/ActiveNotifier.java b/src/main/java/jenkins/plugins/slack/ActiveNotifier.java
@@ -444,7 +444,7 @@ public MessageBuilder appendFailedTests() {
         }
 
         public MessageBuilder appendCustomMessage(Result buildResult) {
-            String customMessage = notifier.getCustomMessage();
+            String customMessage = "";
             if (buildResult != null) {
                 if (buildResult == Result.SUCCESS) {
                     customMessage = notifier.getCustomMessageSuccess();
@@ -458,6 +458,9 @@ public MessageBuilder appendCustomMessage(Result buildResult) {
                     customMessage = notifier.getCustomMessageFailure();
                 }
             }
+            if (customMessage.isEmpty()) {
+                customMessage = notifier.getCustomMessage();
+            }
             try {
                 String replaced = TokenMacro.expandAll(build, new LogTaskListener(logger, INFO), customMessage, false, null);
                 message.append("\n");