Author: pauls
Date: Wed Sep 27 09:22:12 2017
New Revision: 1809819
URL: http://svn.apache.org/viewvc?rev=1809819&view=rev
Log:
SLING-7156: don't make assumptions about the path of URLs returned from
bundle.findEntries()
Modified:
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/SlingTldLocationsCache.java
Modified:
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/SlingTldLocationsCache.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/SlingTldLocationsCache.java?rev=1809819&r1=1809818&r2=1809819&view=diff
==============================================================================
---
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/SlingTldLocationsCache.java
(original)
+++
sling/trunk/bundles/scripting/jsp/src/main/java/org/apache/sling/scripting/jsp/SlingTldLocationsCache.java
Wed Sep 27 09:22:12 2017
@@ -133,8 +133,7 @@ public class SlingTldLocationsCache
synchronized (tldLocations) {
if (uri != null && !tldLocations.containsKey(uri)) {
- tldLocations.put(uri, new TldLocationEntry(bundle,
- taglib.getPath()));
+ tldLocations.put(uri, new TldLocationEntry(bundle,
taglib));
}
}
}
@@ -213,9 +212,9 @@ public class SlingTldLocationsCache
private final URL tldURL;
- private TldLocationEntry(final Bundle bundle, final String tldPath) {
+ private TldLocationEntry(final Bundle bundle, final URL tldURL) {
this.bundleId = bundle.getBundleId();
- this.tldURL = bundle.getEntry(tldPath);
+ this.tldURL = tldURL;
}
long getBundleId() {
