You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@sling.apache.org by ol...@apache.org on 2017/02/26 19:03:43 UTC

svn commit: r1784472 - /sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/DefaultValidationFailure.java

Author: olli
Date: Sun Feb 26 19:03:43 2017
New Revision: 1784472

URL: http://svn.apache.org/viewvc?rev=1784472&view=rev
Log:
SLING-6569 NPE in DefaultValidationFailure when resource bundle is null

Modified:
    sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/DefaultValidationFailure.java

Modified: sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/DefaultValidationFailure.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/DefaultValidationFailure.java?rev=1784472&r1=1784471&r2=1784472&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/DefaultValidationFailure.java (original)
+++ sling/trunk/bundles/extensions/validation/api/src/main/java/org/apache/sling/validation/spi/DefaultValidationFailure.java Sun Feb 26 19:03:43 2017
@@ -61,7 +61,11 @@ public class DefaultValidationFailure im
     @SuppressWarnings("null")
     @Override
     public @Nonnull String getMessage(@Nonnull ResourceBundle resourceBundle) {
-        return MessageFormat.format(resourceBundle.getString(messageKey), messageArguments);
+        if (resourceBundle != null) {
+            return MessageFormat.format(resourceBundle.getString(messageKey), messageArguments);
+        } else {
+            return "";
+        }
     }
 
     @Override