Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix mounting/unmounting lifecycle of TLD resources 

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
This commit is contained in:
Ludovic Orban 2022-07-27 10:49:47 +02:00
parent 1cb80cf4ca
commit b1d5f908a6
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jetty-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/MetaInfConfiguration.java
View File

@ -720,8 +720,11 @@ public class MetaInfConfiguration extends AbstractConfiguration
public Collection<URL> getTlds(URI uri) throws IOException public Collection<URL> getTlds(URI uri) throws IOException
{ {
HashSet<URL> tlds = new HashSet<>(); HashSet<URL> tlds = new HashSet<>();
try (Resource.Mount mount = Resource.mount(uriJarPrefix(uri, "!/")); Resource.Mount mount = Resource.mount(uriJarPrefix(uri, "!/"));
Stream<Path> stream = Files.walk(mount.root().getPath())) if (_mountedResources == null)
_mountedResources = new ArrayList<>();
_mountedResources.add(mount);
try (Stream<Path> stream = Files.walk(mount.root().getPath()))
{ {
Iterator<Path> it = stream Iterator<Path> it = stream
.filter(MetaInfConfiguration::isTldFile) .filter(MetaInfConfiguration::isTldFile)

7
jetty-ee9/jetty-ee9-webapp/src/main/java/org/eclipse/jetty/ee9/webapp/MetaInfConfiguration.java
View File

@ -713,8 +713,11 @@ public class MetaInfConfiguration extends AbstractConfiguration
public Collection<URL> getTlds(URI uri) throws IOException public Collection<URL> getTlds(URI uri) throws IOException
{ {
HashSet<URL> tlds = new HashSet<>(); HashSet<URL> tlds = new HashSet<>();
try (Resource.Mount mount = Resource.mount(uriJarPrefix(uri, "!/")); Resource.Mount mount = Resource.mount(uriJarPrefix(uri, "!/"));
Stream<Path> stream = Files.walk(mount.root().getPath())) if (_mountedResources == null)
_mountedResources = new ArrayList<>();
_mountedResources.add(mount);
try (Stream<Path> stream = Files.walk(mount.root().getPath()))
{ {
Iterator<Path> it = stream Iterator<Path> it = stream
.filter(MetaInfConfiguration::isTldFile) .filter(MetaInfConfiguration::isTldFile)