commit dae15c038b6751fbd0911c5ff7e3d400e33581d0
author Carsten Ziegeler <cziegeler@apache.org> Fri Apr 10 06:08:55 2015 +0000
committer Carsten Ziegeler <cziegeler@apache.org> Fri Apr 10 06:08:55 2015 +0000
tree 5bedac90a8291bc3c0dae575257825deac59db39
parent 38d4dcd7adb935cfbebe373c36ddd2ca149a9327

SLING-4579 : Regression introduced by SLING-4512 : JCR API used in i18n implementation

git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/i18n@1672556 13f79535-47bb-0310-9956-ffa450edef68

src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java

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 10b5335..6db2226 100644
--- a/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java
+++ b/src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java
@@ -46,8 +46,6 @@
 
     private static final Logger log = LoggerFactory.getLogger(JcrResourceBundle.class);
 
-    static final String RT_MESSAGE_ENTRY = "sling:MessageEntry";
-
     static final String MIXIN_MESSAGE = "sling:Message";
 
     static final String PROP_KEY = "sling:key";
@@ -290,26 +288,10 @@
     private void scanForSlingMessages(final Resource rsrc, final Map<String, Object> targetDictionary) {
         final ValueMap vm = rsrc.adaptTo(ValueMap.class);
         if ( vm != null ) {
-            // resource type check, as in JCR a mixin might be used, a simple resource type checking
-            // does unfortunately not work
-            boolean checked = rsrc.isResourceType(RT_MESSAGE_ENTRY);
-            if ( !checked ) {
-                final String[] mixins = vm.get(PROP_MIXINS, String[].class);
-                if ( mixins != null ) {
-                    for(final String m : mixins) {
-                        if ( MIXIN_MESSAGE.equals(m) ) {
-                            checked = true;
-                            break;
-                        }
-                    }
-                }
-            }
-            if ( checked ) {
-                final String value = vm.get(PROP_VALUE, String.class);
-                if ( value != null ) {
-                    final String key = vm.get(PROP_KEY, rsrc.getName());
-                    targetDictionary.put(key, value);
-                }
+            final String value = vm.get(PROP_VALUE, String.class);
+            if ( value != null ) {
+                final String key = vm.get(PROP_KEY, rsrc.getName());
+                targetDictionary.put(key, value);
             }
         }