svn commit: r1750957 - /sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ResourceBundleMessageResolver.java

[olli]

Author: olli
Date: Fri Jul  1 15:05:46 2016
New Revision: 1750957

URL: http://svn.apache.org/viewvc?rev=1750957&view=rev
Log:
SLING-5075 Upgrade Thymeleaf to 3.0

add null checks for key and resource bundle

Modified:
    
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ResourceBundleMessageResolver.java

Modified: 
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ResourceBundleMessageResolver.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ResourceBundleMessageResolver.java?rev=1750957&r1=1750956&r2=1750957&view=diff
==============================================================================
--- 
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ResourceBundleMessageResolver.java
 (original)
+++ 
sling/trunk/contrib/scripting/org.apache.sling.scripting.thymeleaf/src/main/java/org/apache/sling/scripting/thymeleaf/internal/ResourceBundleMessageResolver.java
 Fri Jul  1 15:05:46 2016
@@ -133,8 +133,14 @@ public class ResourceBundleMessageResolv
     public String resolveMessage(final ITemplateContext templateContext, final 
Class<?> origin, final String key, final Object[] messageParameters) {
         logger.debug("resolving message for '{}' ({}) with message parameters 
{}", key, origin, messageParameters);
         // TODO can origin be useful with Sling i18n?
+        if (key == null) {
+            return null;
+        }
         final Locale locale = templateContext.getLocale();
         final ResourceBundle resourceBundle = 
resourceBundleProvider.getResourceBundle(locale);
+        if (resourceBundle == null) {
+            return null;
+        }
         final String string = resourceBundle.getString(key);
         final MessageFormat messageFormat = new MessageFormat(string, locale);
         final String message = messageFormat.format((messageParameters != null 
? messageParameters : EMPTY_MESSAGE_PARAMETERS));