You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2015/01/28 10:46:11 UTC
svn commit: r1655252 -
/sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergedResource.java
Author: cziegeler
Date: Wed Jan 28 09:46:11 2015
New Revision: 1655252
URL: http://svn.apache.org/r1655252
Log:
Remove wrong break statement again
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=1655252&r1=1655251&r2=1655252&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 28 09:46:11 2015
@@ -67,11 +67,11 @@ public class MergedResource extends Abst
String rt = this.properties.get(ResourceResolver.PROPERTY_RESOURCE_TYPE, String.class);
if (rt == null) {
rt = relativePath.length() == 0 ? "/" : relativePath;
+ // use the resource type of the last resource in the set that provides one
for(final Resource rsrc : mappedResources) {
final String value = rsrc.getResourceType();
if ( value != null ) {
rt = value;
- break;
}
}
}