diff options
Diffstat (limited to 'src/com/gitblit/MailExecutor.java')
| -rw-r--r-- | src/com/gitblit/MailExecutor.java | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/com/gitblit/MailExecutor.java b/src/com/gitblit/MailExecutor.java index 202875ed..bfe2232f 100644 --- a/src/com/gitblit/MailExecutor.java +++ b/src/com/gitblit/MailExecutor.java @@ -145,8 +145,11 @@ public class MailExecutor implements Runnable { public Message createMessage(List<String> toAddresses) {
MimeMessage message = new MimeMessage(session);
try {
- InternetAddress from = new InternetAddress(settings.getString(Keys.mail.fromAddress,
- "gitblit@gitblit.com"), "Gitblit");
+ String fromAddress = settings.getString(Keys.mail.fromAddress, null);
+ if (StringUtils.isEmpty(fromAddress)) {
+ fromAddress = "gitblit@gitblit.com";
+ }
+ InternetAddress from = new InternetAddress(fromAddress, "Gitblit");
message.setFrom(from);
InternetAddress[] tos = new InternetAddress[toAddresses.size()];
@@ -162,6 +165,15 @@ public class MailExecutor implements Runnable { }
/**
+ * Returns the status of the mail queue.
+ *
+ * @return true, if the queue is empty
+ */
+ public boolean hasEmptyQueue() {
+ return queue.isEmpty();
+ }
+
+ /**
* Queue's an email message to be sent.
*
* @param message
|