Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2012-11-05 00:28:25 -0500
committerJan Bartel2012-11-05 00:28:25 -0500
commitf3af8c86505bd01ad24db940a252fddc6dff8a10 (patch)
tree5d2c2aeb8f5317ff9b738fdafcbe8ec3d2d9e22b /jetty-security/src/main/java
parent5ad2161259b2d098f39f5176e348a84106cf43c8 (diff)
parentfff825a9979b7d1c6127a0fe274536a269c42c7b (diff)
downloadorg.eclipse.jetty.project-f3af8c86505bd01ad24db940a252fddc6dff8a10.tar.gz
org.eclipse.jetty.project-f3af8c86505bd01ad24db940a252fddc6dff8a10.tar.xz
org.eclipse.jetty.project-f3af8c86505bd01ad24db940a252fddc6dff8a10.zip
Merge remote-tracking branch 'origin/jetty-7' into jetty-8
Diffstat (limited to 'jetty-security/src/main/java')
-rw-r--r--jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java4
1 files changed, 4 insertions, 0 deletions
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 95bcbde894..4f37469028 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
@@ -335,18 +335,22 @@ public abstract class SecurityHandler extends HandlerWrapper implements Authenti
if (_identityService==null)
{
+
if (_loginService!=null)
_identityService=_loginService.getIdentityService();
+ System.err.println("Null identity service, trying login service: "+_identityService);
if (_identityService==null)
_identityService=findIdentityService();
+ System.err.println("Finding identity service: "+_identityService);
if (_identityService==null && _realmName!=null)
_identityService=new DefaultIdentityService();
}
if (_loginService!=null)
{
+ System.err.println("LoginService="+_loginService + " identityService="+_identityService);
if (_loginService.getIdentityService()==null)
_loginService.setIdentityService(_identityService);
else if (_loginService.getIdentityService()!=_identityService)

Back to the top