From 7c7c6e3d5eb4355cadb35be27fe65d60697c8214 Mon Sep 17 00:00:00 2001 From: Jacker Date: Tue, 14 May 2024 12:53:04 +0300 Subject: [PATCH 1/2] jetty#11789 run list distinct on the generated resources list during startup --- .../src/main/java/org/eclipse/jetty/ee10/webapp/MetaData.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 index af49251472e0..064b00bc367e 100644 --- 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 @@ -485,7 +485,8 @@ public void resolve(WebAppContext context) resources.add(null); //always apply annotations with no resource first resources.addAll(_orderedContainerResources); //next all annotations from container path resources.addAll(_webInfClasses); //next everything from web-inf classes - resources.addAll(getWebInfResources(isOrdered())); //finally annotations (in order) from webinf path + resources.addAll(getWebInfResources(isOrdered())); //finally annotations (in order) from webinf path + resources = resources.stream().distinct().collect(Collectors.toList()); // filter out possible duplicates for (Resource r : resources) { From 900afeefe294e5e30e3d5101ef37a1ac0c129df0 Mon Sep 17 00:00:00 2001 From: Jacker Date: Tue, 14 May 2024 13:32:12 +0300 Subject: [PATCH 2/2] jetty#11789 added missing import statement --- .../src/main/java/org/eclipse/jetty/ee10/webapp/MetaData.java | 1 + 1 file changed, 1 insertion(+) 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 index 064b00bc367e..01e1ee416b4a 100644 --- 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 @@ -21,6 +21,7 @@ import java.util.List; import java.util.Map; import java.util.Objects; +import java.util.stream.Collectors; import jakarta.servlet.ServletContext; import org.eclipse.jetty.util.URIUtil;