fix compilation error of previous commit
Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/a1b0c42b Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/a1b0c42b Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/a1b0c42b Branch: refs/heads/swellrt Commit: a1b0c42b01c5407c508a8418ac38eba3519f9892 Parents: 44d123b Author: Antonio Tenorio Fornés <[email protected]> Authored: Tue Oct 4 17:17:18 2016 +0200 Committer: Antonio Tenorio Fornés <[email protected]> Committed: Tue Oct 4 17:17:18 2016 +0200 ---------------------------------------------------------------------- wave/build.gradle | 2 +- .../java/org/swellrt/server/box/servlet/JoinMessageService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/a1b0c42b/wave/build.gradle ---------------------------------------------------------------------- diff --git a/wave/build.gradle b/wave/build.gradle index fe3fa10..a9b3e28 100644 --- a/wave/build.gradle +++ b/wave/build.gradle @@ -30,7 +30,7 @@ apply plugin: 'com.google.protobuf' /* Meta Data Info */ def title = 'SwellRT' def vendor = 'SwellRT Community' -version = "0.54.3-alpha" +version = "0.54.4-alpha" archivesBaseName = "swellrt" def distFolder = "swellrt" mainClassName = "org.waveprotocol.box.server.ServerMain" http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/a1b0c42b/wave/src/main/java/org/swellrt/server/box/servlet/JoinMessageService.java ---------------------------------------------------------------------- diff --git a/wave/src/main/java/org/swellrt/server/box/servlet/JoinMessageService.java b/wave/src/main/java/org/swellrt/server/box/servlet/JoinMessageService.java index 2003244..c2498a0 100644 --- a/wave/src/main/java/org/swellrt/server/box/servlet/JoinMessageService.java +++ b/wave/src/main/java/org/swellrt/server/box/servlet/JoinMessageService.java @@ -130,7 +130,7 @@ public class JoinMessageService extends BaseService { String subject; - if (participantId != null && !acc.getId().isAnonymous()){ + if (participantId != null && hum != null && !hum.getId().isAnonymous()) { String inviter = participantId.getAddress().split("@")[0]; subject = MessageFormat.format(b.getString("joinNamedEmailSubject"), inviter, urlText); } else {
