From 9984ea8f5d9fad31a5e68935756ca8eb406d6b2c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 20 Oct 2014 16:31:14 -0400
Subject: [PATCH] Merge release 1.6.1
---
src/main/java/com/gitblit/tickets/TicketNotifier.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/gitblit/tickets/TicketNotifier.java b/src/main/java/com/gitblit/tickets/TicketNotifier.java
index 07371b1..d6217b3 100644
--- a/src/main/java/com/gitblit/tickets/TicketNotifier.java
+++ b/src/main/java/com/gitblit/tickets/TicketNotifier.java
@@ -596,7 +596,7 @@
// respect the author's email preference
UserModel lastAuthor = userManager.getUserModel(lastChange.author);
- if (!lastAuthor.getPreferences().isEmailMeOnMyTicketChanges()) {
+ if (lastAuthor != null && !lastAuthor.getPreferences().isEmailMeOnMyTicketChanges()) {
toAddresses.remove(lastAuthor.emailAddress);
ccAddresses.remove(lastAuthor.emailAddress);
}
--
Gitblit v1.9.1