[sling-org-apache-sling-i18n] branch master updated: SLING-7421 - JcrResourceBundle does not correctly support multiple base names

[ro...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-i18n.git


The following commit(s) were added to refs/heads/master by this push:
     new c1d8ad1  SLING-7421 - JcrResourceBundle does not correctly support multiple base names
c1d8ad1 is described below

commit c1d8ad1cb2ef8b4ff3dcfed68cabbf7207b16b7f
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Mon Jan 22 13:47:48 2018 +0200

    SLING-7421 - JcrResourceBundle does not correctly support multiple base names
    
    Actually read the basename property.
---
 src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java b/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java
index f1abb04..56c80aa 100644
--- a/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java
+++ b/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java
@@ -338,7 +338,7 @@ public class JcrResourceBundle extends ResourceBundle {
                         || language.equals(localeRFC4646StringLower)) {
                     // basename might be a multivalue (see https://issues.apache.org/jira/browse/SLING-4547)
                     String[] baseNames = properties.get(PROP_BASENAME, new String[]{});
-                    if (baseName == null || Arrays.asList(baseName).contains(baseName)) {
+                    if (baseName == null || Arrays.asList(baseNames).contains(baseName)) {
                         paths.add(bundle.getPath());
                     }
                 }

-- 
To stop receiving notification emails like this one, please contact
rombert@apache.org.