From 4aeec822d0fe9306c4ca64f1a1d9683f77684198 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 28 Mar 2013 16:58:40 -0400
Subject: [PATCH] Do not queue emails with no recipients (issue 200)
---
releases.moxie | 1 +
src/main/java/com/gitblit/GitBlit.java | 8 ++++++++
2 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/releases.moxie b/releases.moxie
index 3667326..d79c1a4 100644
--- a/releases.moxie
+++ b/releases.moxie
@@ -10,6 +10,7 @@
- Fix NPE when getting user's fork without repository list caching (issue 182)
- Fix internal error on folder history links (issue 192)
- Fixed incorrect icon file name for .doc files (issue 200)
+ - Do not queue emails with no recipients (issue 201)
additions:
- Option to force client-side basic authentication instead of form-based authentication if web.authenticateViewPages=true (issue 222)
diff --git a/src/main/java/com/gitblit/GitBlit.java b/src/main/java/com/gitblit/GitBlit.java
index 2361a6e..b8daa06 100644
--- a/src/main/java/com/gitblit/GitBlit.java
+++ b/src/main/java/com/gitblit/GitBlit.java
@@ -2903,6 +2903,10 @@
* @param toAddresses
*/
public void sendMail(String subject, String message, String... toAddresses) {
+ if (toAddresses == null || toAddresses.length == 0) {
+ logger.debug(MessageFormat.format("Dropping message {0} because there are no recipients", subject));
+ return;
+ }
try {
Message mail = mailExecutor.createMessage(toAddresses);
if (mail != null) {
@@ -2934,6 +2938,10 @@
* @param toAddresses
*/
public void sendHtmlMail(String subject, String message, String... toAddresses) {
+ if (toAddresses == null || toAddresses.length == 0) {
+ logger.debug(MessageFormat.format("Dropping message {0} because there are no recipients", subject));
+ return;
+ }
try {
Message mail = mailExecutor.createMessage(toAddresses);
if (mail != null) {
--
Gitblit v1.9.1