jetty-9 combined the Container and AggregateLifeCycle into ContainerLifeCycle

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;
     }