sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From romb...@apache.org
Subject [sling-org-apache-sling-resourcemerger] 04/11: SLING-4915 remove irrelevant code
Date Tue, 07 Nov 2017 10:00:41 GMT
This is an automated email from the ASF dual-hosted git repository.

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

commit 8682a3812cf6bb1917fc5609d7c0b5ec94d03f33
Author: Konrad Windszus <kwin@apache.org>
AuthorDate: Fri Feb 12 11:00:32 2016 +0000

    SLING-4915 remove irrelevant code
    
    git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/contrib/extensions/resourcemerger@1729983
13f79535-47bb-0310-9956-ffa450edef68
---
 .../apache/sling/resourcemerger/impl/MergingResourceProvider.java   | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java
b/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java
index 735d208..318529d 100644
--- a/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java
+++ b/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java
@@ -324,12 +324,6 @@ public class MergingResourceProvider extends ResourceProvider<Void>
{
                             break;
                         }
                     }
-                    for (final ResourceHolder current : candidates) {
-                        if (current.name.equals(rsrcName)) {
-                            holder = current;
-                            break;
-                        }
-                    }
                     if (holder == null) {
                         // remove the hidden child resources from the local resource
                         if (handler != null && handler.isHidden(rsrcName, true))
{

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

Mime
View raw message