Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2012-09-20 21:45:51 -0400
committerGreg Wilkins2012-09-20 21:45:51 -0400
commit68ee346b8a4eeb38c8ef0277973b96ddc6b0bb72 (patch)
treed6a85e868fda781fd9c99d63a79a7b232cdcaaa5 /jetty-security/src/main/java
parent15804e76e2f0a168016e7d27245e06818fb68b92 (diff)
downloadorg.eclipse.jetty.project-68ee346b8a4eeb38c8ef0277973b96ddc6b0bb72.tar.gz
org.eclipse.jetty.project-68ee346b8a4eeb38c8ef0277973b96ddc6b0bb72.tar.xz
org.eclipse.jetty.project-68ee346b8a4eeb38c8ef0277973b96ddc6b0bb72.zip
jetty-9 combined the Container and AggregateLifeCycle into ContainerLifeCycle
Diffstat (limited to 'jetty-security/src/main/java')
-rw-r--r--jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java8
-rw-r--r--jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java5
2 files changed, 6 insertions, 7 deletions
diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java b/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
index a9e688bbfb..ec998dd131 100644
--- a/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
+++ b/jetty-security/src/main/java/org/eclipse/jetty/security/ConstraintSecurityHandler.java
@@ -427,14 +427,12 @@ public class ConstraintSecurityHandler extends SecurityHandler implements Constr
@Override
public void dump(Appendable out,String indent) throws IOException
{
- dumpThis(out);
- dump(out,indent,
+ // TODO these should all be beans
+ dumpBeans(out,indent,
Collections.singleton(getLoginService()),
Collections.singleton(getIdentityService()),
Collections.singleton(getAuthenticator()),
Collections.singleton(_roles),
- _constraintMap.entrySet(),
- getBeans(),
- TypeUtil.asList(getHandlers()));
+ _constraintMap.entrySet());
}
}
diff --git a/jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java b/jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java
index 19441d5b60..47af1622c7 100644
--- a/jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java
+++ b/jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java
@@ -20,6 +20,7 @@ package org.eclipse.jetty.security;
import java.io.IOException;
import java.security.Principal;
+import java.util.Collection;
import java.util.Enumeration;
import java.util.HashMap;
import java.util.List;
@@ -255,7 +256,7 @@ public abstract class SecurityHandler extends HandlerWrapper implements Authenti
/* ------------------------------------------------------------ */
protected LoginService findLoginService()
{
- List<LoginService> list = getServer().getBeans(LoginService.class);
+ Collection<LoginService> list = getServer().getBeans(LoginService.class);
String realm=getRealmName();
if (realm!=null)
@@ -265,7 +266,7 @@ public abstract class SecurityHandler extends HandlerWrapper implements Authenti
return service;
}
else if (list.size()==1)
- return list.get(0);
+ return list.iterator().next();
return null;
}

Back to the top