From 2446ca3b5d668143e01e8cb6a3b287854bb9e7d1 Mon Sep 17 00:00:00 2001 From: gregw Date: Wed, 28 Oct 2020 15:21:57 +0100 Subject: [PATCH] Fixes #5521 ResourceCollection list NPE Fix from review. remove duplicate line. --- .../java/org/eclipse/jetty/util/resource/ResourceCollection.java | 1 - 1 file changed, 1 deletion(-) diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/ResourceCollection.java b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/ResourceCollection.java index 4b8b8818d179..3f080072465a 100644 --- a/jetty-util/src/main/java/org/eclipse/jetty/util/resource/ResourceCollection.java +++ b/jetty-util/src/main/java/org/eclipse/jetty/util/resource/ResourceCollection.java @@ -440,7 +440,6 @@ public String[] list() String[] list = r.list(); if (list != null) Collections.addAll(set, list); - Collections.addAll(set, r.list()); } String[] result = set.toArray(new String[0]); Arrays.sort(result);