summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2014-10-13 19:16:51 -0400
committerJames Moger <james.moger@gitblit.com>2014-10-13 19:16:51 -0400
commit70250d8ff53081eaccac24517ea96b89d27507b9 (patch)
treef764747402ba32cbc85c02e581a41888b19749e8 /src
parentcdb92477597f84f9c45347c803c6d305dea6ff2e (diff)
downloadgitblit-70250d8ff53081eaccac24517ea96b89d27507b9.tar.gz
gitblit-70250d8ff53081eaccac24517ea96b89d27507b9.zip
Fix potential NPE when excluding last change author
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/gitblit/tickets/TicketNotifier.java2
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 07371b1b..d6217b35 100644
--- a/src/main/java/com/gitblit/tickets/TicketNotifier.java
+++ b/src/main/java/com/gitblit/tickets/TicketNotifier.java
@@ -596,7 +596,7 @@ public class TicketNotifier {
// 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);
}