From c44c31998fed0e2a69c867878f5d5220366f44b5 Mon Sep 17 00:00:00 2001 From: Jan Bartel Date: Wed, 29 Nov 2023 10:14:10 +1100 Subject: [PATCH] Change post review --- .../org/eclipse/jetty/ee10/webapp/MetaInfConfiguration.java | 4 +--- .../org/eclipse/jetty/ee9/webapp/MetaInfConfiguration.java | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/jetty-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/MetaInfConfiguration.java b/jetty-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/MetaInfConfiguration.java index 2e7822b9f1fa..6c8d99b43896 100644 --- a/jetty-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/MetaInfConfiguration.java +++ b/jetty-ee10/jetty-ee10-webapp/src/main/java/org/eclipse/jetty/ee10/webapp/MetaInfConfiguration.java @@ -356,10 +356,8 @@ public void scanJars(final WebAppContext context, Collection jars, boo { try (ResourceFactory.Closeable scanResourceFactory = ResourceFactory.closeable()) { - for (Resource r : jars) + for (Resource dir : jars) { - Resource dir = r; - try { //If not already a directory, convert by mounting as jar file diff --git a/jetty-ee9/jetty-ee9-webapp/src/main/java/org/eclipse/jetty/ee9/webapp/MetaInfConfiguration.java b/jetty-ee9/jetty-ee9-webapp/src/main/java/org/eclipse/jetty/ee9/webapp/MetaInfConfiguration.java index 404b8c6c81ad..07a316ea584d 100644 --- a/jetty-ee9/jetty-ee9-webapp/src/main/java/org/eclipse/jetty/ee9/webapp/MetaInfConfiguration.java +++ b/jetty-ee9/jetty-ee9-webapp/src/main/java/org/eclipse/jetty/ee9/webapp/MetaInfConfiguration.java @@ -362,10 +362,8 @@ public void scanJars(final WebAppContext context, Collection jars, boo { try (ResourceFactory.Closeable scanResourceFactory = ResourceFactory.closeable()) { - for (Resource r : jars) + for (Resource dir : jars) { - Resource dir = r; - try { //if not already a directory, convert it by mounting as jar file