Merge pull request #10169 from RangerRick/ranger/jetty-npe-websocket-…

…init make sure that a ServiceLoader is retrieved before iterating
jetty · Aug 11, 2023 · 490626e · 490626e
2 parents 88d70ca + 1327402
commit 490626e
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/...socket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/ExtensionFactory.java b/...socket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/ExtensionFactory.java
@@ -37,7 +37,12 @@ public abstract class ExtensionFactory implements Iterable<Class<? extends Exten
     public ExtensionFactory()
     {
         availableExtensions = new HashMap<>();
-        Iterator<Extension> iterator = ServiceLoader.load(Extension.class).iterator();
+        final ServiceLoader sl = ServiceLoader.load(Extension.class);
+        if (sl == null)
+        {
+            return;
+        }
+        final Iterator<Extension> iterator = sl.iterator();
         while (true)
         {
             try