You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ju...@apache.org on 2015/01/21 18:05:14 UTC

svn commit: r1653604 - /sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResource.java

Author: justin
Date: Wed Jan 21 17:05:14 2015
New Revision: 1653604

URL: http://svn.apache.org/r1653604
Log:
SLING-4340 - getting the resource type property *first* and then falling back to the first non-null getResourceType() result.

Modified:
    sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResource.java

Modified: sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResource.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResource.java?rev=1653604&r1=1653603&r2=1653604&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResource.java (original)
+++ sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResource.java Wed Jan 21 17:05:14 2015
@@ -64,11 +64,14 @@ public class MergedResource extends Abst
         this.path = (relativePath.length() == 0 ? mergeRootPath : mergeRootPath + "/" + relativePath);
         this.properties = new DeepReadValueMapDecorator(this, new MergedValueMap(valueMaps));
         // get resource type
-        String rt = (relativePath.length() == 0 ? "/" : relativePath);
-        for(final Resource rsrc : mappedResources) {
-            final String value = rsrc.getResourceType();
-            if ( value != null ) {
-                rt = value;
+        String rt = this.properties.get(ResourceResolver.PROPERTY_RESOURCE_TYPE, String.class);
+        if (rt == null) {
+            rt = relativePath.length() == 0 ? "/" : relativePath;
+            for(final Resource rsrc : mappedResources) {
+                final String value = rsrc.getResourceType();
+                if ( value != null ) {
+                    rt = value;
+                }
             }
         }
         this.resourceType = rt;