Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4710 from eclipse/jetty-9.4.x-4621-SecurityHandler-ServiceLoader 

Issue #4621 - warn instead of throwing for errors while discovering Authenticator.Factory implementations with ServiceLoader
This commit is contained in:
Lachlan 2020-03-27 09:39:32 +11:00 committed by GitHub
parent 6ab4cd306d 929e38373c
commit fb909057a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java
View File

@ -24,8 +24,10 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.ServiceConfigurationError;
import java.util.ServiceLoader;
import java.util.Set;
import javax.servlet.ServletException;
@ -76,9 +78,19 @@ public abstract class SecurityHandler extends HandlerWrapper implements Authenti
static
{
for (Authenticator.Factory factory : ServiceLoader.load(Authenticator.Factory.class))
Iterator<Authenticator.Factory> serviceLoaderIterator = ServiceLoader.load(Authenticator.Factory.class).iterator();
while (true)
{
__knownAuthenticatorFactories.add(factory);
try
{
if (!serviceLoaderIterator.hasNext())
break;
__knownAuthenticatorFactories.add(serviceLoaderIterator.next());
}
catch (ServiceConfigurationError error)
{
LOG.warn("Error while loading AuthenticatorFactory with ServiceLoader", error);
}
}
__knownAuthenticatorFactories.add(new DefaultAuthenticatorFactory());