You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ra...@apache.org on 2020/04/03 14:53:30 UTC
[sling-org-apache-sling-scripting-bundle-tracker] branch master
updated: SLING-9255 - Allow servlet resolution based on path
This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-scripting-bundle-tracker.git
The following commit(s) were added to refs/heads/master by this push:
new 492f39a SLING-9255 - Allow servlet resolution based on path
492f39a is described below
commit 492f39a5af3ffad30ca7ea1e3e22d4494d055b4c
Author: Radu Cotescu <ra...@apache.org>
AuthorDate: Fri Apr 3 16:53:03 2020 +0200
SLING-9255 - Allow servlet resolution based on path
* corrected providers collection for inheritance
---
.../bundle/tracker/internal/BundledScriptTracker.java | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptTracker.java b/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptTracker.java
index 0cab4c6..73c7cf2 100644
--- a/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptTracker.java
+++ b/src/main/java/org/apache/sling/scripting/bundle/tracker/internal/BundledScriptTracker.java
@@ -388,15 +388,15 @@ public class BundledScriptTracker implements BundleTrackerCustomizer<List<Servic
ServletCapability servletCapability =
ServletCapability.fromBundleCapability(providedWire.getCapability());
String capabilityExtends = servletCapability.getExtendedResourceType();
- if (servletCapability.getSelectors().isEmpty() && StringUtils.isNotEmpty(capabilityExtends)) {
- for (ResourceType providedResourceType : servletCapability.getResourceTypes()) {
- if (providedResourceType.getType().equals(extendedResourceType)) {
- collectProvidersChain(providers, providedWire.getProvider()
- .getBundle().adapt(BundleWiring.class), capabilityExtends);
+ for (ResourceType providedResourceType : servletCapability.getResourceTypes()) {
+ if (providedResourceType.getType().equals(extendedResourceType) && servletCapability.getSelectors().isEmpty()) {
+ if (StringUtils.isNotEmpty(capabilityExtends)) {
+ collectProvidersChain(providers, providedWire.getProvider().getBundle().adapt(BundleWiring.class),
+ capabilityExtends);
+ } else {
+ providers.add(new TypeProvider(servletCapability, providedWire.getProvider().getBundle()));
}
}
- } else {
- providers.add(new TypeProvider(servletCapability, providedWire.getProvider().getBundle()));
}
}
}