Skip to content

Commit 490626e

Browse files
authored
Merge pull request #10169 from RangerRick/ranger/jetty-npe-websocket-init
make sure that a ServiceLoader is retrieved before iterating
2 parents 88d70ca + 1327402 commit 490626e

File tree

1 file changed

+6
-1
lines changed
  • jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions

1 file changed

+6
-1
lines changed

jetty-websocket/websocket-api/src/main/java/org/eclipse/jetty/websocket/api/extensions/ExtensionFactory.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,12 @@ public abstract class ExtensionFactory implements Iterable<Class<? extends Exten
3737
public ExtensionFactory()
3838
{
3939
availableExtensions = new HashMap<>();
40-
Iterator<Extension> iterator = ServiceLoader.load(Extension.class).iterator();
40+
final ServiceLoader sl = ServiceLoader.load(Extension.class);
41+
if (sl == null)
42+
{
43+
return;
44+
}
45+
final Iterator<Extension> iterator = sl.iterator();
4146
while (true)
4247
{
4348
try

0 commit comments

Comments
 (0)