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/03/02 18:56:03 UTC

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

Author: olli
Date: Thu Mar  2 18:56:03 2017
New Revision: 1785186

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

throw meaningful NPE

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=1785186&r1=1785185&r2=1785186&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 Thu Mar  2 18:56:03 2017
@@ -61,11 +61,10 @@ public class DefaultValidationFailure im
     @SuppressWarnings("null")
     @Override
     public @Nonnull String getMessage(@Nonnull ResourceBundle resourceBundle) {
-        if (resourceBundle != null) {
-            return MessageFormat.format(resourceBundle.getString(messageKey), messageArguments);
-        } else {
-            return "";
+        if (resourceBundle == null) {
+            throw new NullPointerException("ResourceBundle must not be null");
         }
+        return MessageFormat.format(resourceBundle.getString(messageKey), messageArguments);
     }
 
     @Override