You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by kw...@apache.org on 2016/02/12 12:00:32 UTC
svn commit: r1729983 -
/sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java
Author: kwin
Date: Fri Feb 12 11:00:32 2016
New Revision: 1729983
URL: http://svn.apache.org/viewvc?rev=1729983&view=rev
Log:
SLING-4915 remove irrelevant code
Modified:
sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java
Modified: sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java?rev=1729983&r1=1729982&r2=1729983&view=diff
==============================================================================
--- sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java (original)
+++ sling/trunk/contrib/extensions/resourcemerger/src/main/java/org/apache/sling/resourcemerger/impl/MergingResourceProvider.java Fri Feb 12 11:00:32 2016
@@ -324,12 +324,6 @@ public class MergingResourceProvider ext
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)) {