From c771cd5c7a16aacc090aaa9bc7c1150a5ca6f590 Mon Sep 17 00:00:00 2001 From: Edwin Kempin Date: Fri, 20 May 2011 08:00:09 +0200 Subject: [PATCH] Fix NPE on Gerrit startup if mail.from doesn't include a name If for mail.from in the gerrit.config only an e-mail address but no name was set, Gerrit failed on startup with a NullPointerException. Bug: issue 961 Change-Id: Ie99a6c7ae42d77e408bc624408b2d13c8b5f9797 Signed-off-by: Edwin Kempin --- .../gerrit/server/mail/FromAddressGeneratorProvider.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java b/gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java index 2d739ea1aa..afcfccd340 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/mail/FromAddressGeneratorProvider.java @@ -52,8 +52,8 @@ public class FromAddressGeneratorProvider implements } else { final Address a = Address.parse(from); - final ParamertizedString name = new ParamertizedString(a.name); - if (name.getParameterNames().isEmpty()) { + final ParamertizedString name = a.name != null ? new ParamertizedString(a.name) : null; + if (name == null || name.getParameterNames().isEmpty()) { generator = new ServerGen(a); } else { generator = new PatternGen(srvAddr, accountCache, name, a.email);