Merge pull request #10902 from jetty/jetty-12.0.x-addContainerResource

do not add duplicate jars to MetaData containerResources
jetty · Nov 22, 2023 · 4a91cb7 · 4a91cb7
2 parents f61fa04 + 9a9d8fb
commit 4a91cb7
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/jetty-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/MetaData.java b/jetty-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/MetaData.java
@@ -25,6 +25,7 @@
 import jakarta.servlet.ServletContext;
 import org.eclipse.jetty.util.URIUtil;
 import org.eclipse.jetty.util.resource.Resource;
+import org.eclipse.jetty.util.resource.Resources;
 import org.eclipse.jetty.util.thread.AutoLock;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -714,8 +715,13 @@ public List<Resource> getContainerResources()
 
     public void addContainerResource(Resource jar)
     {
-        Objects.requireNonNull(jar);
-        _orderedContainerResources.add(jar);
+        if (!Resources.isReadable(jar))
+            throw new IllegalArgumentException("Resource is not readable: " + jar);
+
+        if (!_orderedContainerResources.contains(jar))
+            _orderedContainerResources.add(jar);
+        else
+            LOG.warn("Duplicate Container Resource {}", jar);
     }
 
     public void setWebInfClassesResources(List<Resource> dirs)

diff --git a/jetty-ee9/jetty-ee9-webapp/src/main/java/org/eclipse/jetty/ee9/webapp/MetaData.java b/jetty-ee9/jetty-ee9-webapp/src/main/java/org/eclipse/jetty/ee9/webapp/MetaData.java
@@ -25,6 +25,7 @@
 import jakarta.servlet.ServletContext;
 import org.eclipse.jetty.util.URIUtil;
 import org.eclipse.jetty.util.resource.Resource;
+import org.eclipse.jetty.util.resource.Resources;
 import org.eclipse.jetty.util.thread.AutoLock;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -714,7 +715,13 @@ public List<Resource> getContainerResources()
 
     public void addContainerResource(Resource jar)
     {
-        _orderedContainerResources.add(jar);
+        if (!Resources.isReadable(jar))
+            throw new IllegalArgumentException("Resource is not readable: " + jar);
+
+        if (!_orderedContainerResources.contains(jar))
+            _orderedContainerResources.add(jar);
+        else
+            LOG.warn("Duplicate Container Resource {}", jar);
     }
 
     public void setWebInfClassesResources(List<Resource> dirs)