[sling-org-apache-sling-resourcemerger] 12/31: Remove wrong break statement again

[ro...@apache.org]

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

rombert pushed a commit to annotated tag org.apache.sling.resourcemerger-1.2.10
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-resourcemerger.git

commit 916191e399f7e5edca008de593accd429ae96713
Author: Carsten Ziegeler <cz...@apache.org>
AuthorDate: Wed Jan 28 09:46:11 2015 +0000

    Remove wrong break statement again
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resourcemerger@1655252 13f79535-47bb-0310-9956-ffa450edef68
---
 src/main/java/org/apache/sling/resourcemerger/impl/MergedResource.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/org/apache/sling/resourcemerger/impl/MergedResource.java b/src/main/java/org/apache/sling/resourcemerger/impl/MergedResource.java
index 73d6ca1..7b00b98 100644
--- a/src/main/java/org/apache/sling/resourcemerger/impl/MergedResource.java
+++ b/src/main/java/org/apache/sling/resourcemerger/impl/MergedResource.java
@@ -67,11 +67,11 @@ public class MergedResource extends AbstractResource {
         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;
                 }
             }
         }

-- 
To stop receiving notification emails like this one, please contact
"commits@sling.apache.org" <co...@sling.apache.org>.