commit 625a33f00764d52bf63119839ba14b450ff40971
author Karl Pauls <pauls@apache.org> Mon Apr 16 16:03:22 2018 +0200
committer Karl Pauls <pauls@apache.org> Tue May 12 12:30:33 2020 +0200
tree 833b8a0e9b9e3b64f5fa4426d1c12bc4cec34c77
parent 3876edf21615225c51f138d810983e872cb24513

Make the extends requirement filter out selectors.

main/java/org/apache/sling/scripting/resolver/internal/BundledScriptTracker.java

diff --git a/main/java/org/apache/sling/scripting/resolver/internal/BundledScriptTracker.java b/main/java/org/apache/sling/scripting/resolver/internal/BundledScriptTracker.java
index 6908bb9..d9fead3 100644
--- a/main/java/org/apache/sling/scripting/resolver/internal/BundledScriptTracker.java
+++ b/main/java/org/apache/sling/scripting/resolver/internal/BundledScriptTracker.java
@@ -138,9 +138,11 @@
                     Optional<BundleWire> optionalWire = Optional.empty();
 
                     if (StringUtils.isNotEmpty(extendsRT)) {
+
                         LOGGER.debug("Bundle {} extends resource type {} through {}.", bundle.getSymbolicName(), extendsRT, resourceType);
                         optionalWire = bundleWiring.getRequiredWires(NS_SLING_RESOURCE_TYPE).stream().filter(
-                                bundleWire -> extendsRT.equals(bundleWire.getCapability().getAttributes().get(NS_SLING_RESOURCE_TYPE))
+                                bundleWire -> extendsRT.equals(bundleWire.getCapability().getAttributes().get(NS_SLING_RESOURCE_TYPE)) &&
+                                    !bundleWire.getCapability().getAttributes().containsKey(AT_SLING_SELECTORS)
                         ).findFirst();
                     }