HV-1831 Ignore "null" resource bundles for locales

since the map won't be able to hold nulls

Signed-off-by: marko-bekhta <[email protected]>

Author: marko-bekhta

engine/src/main/java/org/hibernate/validator/internal/util/logging/Log.java

@@ -946,4 +946,8 @@ ConstraintDefinitionException getConstraintValidatorDefinitionConstraintMismatch
 	@LogMessage(level = DEBUG)
 	@Message(id = 269, value = "Unable to enable secure XML feature processing when loading %1$s: %2$s")
 	void unableToEnableSecureFeatureProcessingSchemaXml(String fileName, String message);
+
+	@LogMessage(level = WARN)
+	@Message(id = 270, value = "Message resource bundle for the %1$s locale is not available and was not pre-loaded.")
+	void resourceBundleNotPreLoaded(Locale localeToPreload);
 }

engine/src/main/java/org/hibernate/validator/resourceloading/PlatformResourceBundleLocator.java

@@ -149,7 +149,12 @@ public PlatformResourceBundleLocator(String bundleName,
 		if ( !localesToInitialize.isEmpty() ) {
 			Map<Locale, ResourceBundle> tmpPreloadedResourceBundles = CollectionHelper.newHashMap( localesToInitialize.size() );
 			for ( Locale localeToPreload : localesToInitialize ) {
-				tmpPreloadedResourceBundles.put( localeToPreload, doGetResourceBundle( localeToPreload ) );
+				ResourceBundle bundle = doGetResourceBundle( localeToPreload );
+				if ( bundle == null ) {
+					LOG.resourceBundleNotPreLoaded( localeToPreload );
+					continue;
+				}
+				tmpPreloadedResourceBundles.put( localeToPreload, bundle );
 			}
 			this.preloadedResourceBundles = CollectionHelper.toImmutableMap( tmpPreloadedResourceBundles );
 		}