This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 78dc1dd3a960af4ce4d4a748fbc6b9e1ab97c34a Author: Jean Couteau <jean.couteau@gmail.com> Date: Fri Apr 27 16:58:57 2018 +0200 Fix possible NPE --- .../faxtomail/services/service/ConfigurationServiceImpl.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationServiceImpl.java index 5060e0c3..09d9bfb9 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationServiceImpl.java @@ -735,7 +735,14 @@ public class ConfigurationServiceImpl extends FaxToMailServiceSupport implements String domain = FaxToMailServiceUtils.getDomainForEmailAddress(emailAddress); BrandsForDomainTopiaDao dao = getPersistenceContext().getBrandsForDomainDao(); BrandsForDomain brandsForDomain = dao.forDomainNameEquals(domain).findUniqueOrNull(); - return brandsForDomain.getBrands(); + + List<String> brands = null; + + if (brandsForDomain != null){ + brands = brandsForDomain.getBrands(); + } + + return brands; } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.