Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse McConnell2012-01-26 16:43:46 -0500
committerJesse McConnell2012-01-26 16:43:46 -0500
commit349804c5e784e154476c417c72d91501cbe1900c (patch)
tree6073f4d1e6515ee3f2a79e2bd4774311813f8850 /jetty-security/src
parent1691441296598d85685b002392db8345c087461f (diff)
parentce2dd8e30ec8199e8f1adbe5dd511f0e83cae244 (diff)
downloadorg.eclipse.jetty.project-349804c5e784e154476c417c72d91501cbe1900c.tar.gz
org.eclipse.jetty.project-349804c5e784e154476c417c72d91501cbe1900c.tar.xz
org.eclipse.jetty.project-349804c5e784e154476c417c72d91501cbe1900c.zip
Merge branch 'master' into jetty-8
Diffstat (limited to 'jetty-security/src')
-rw-r--r--jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java8
1 files changed, 5 insertions, 3 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 538533c658..f6af097880 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
@@ -306,7 +306,7 @@ public abstract class SecurityHandler extends HandlerWrapper implements Authenti
if (_identityService==null)
_identityService=findIdentityService();
- if (_identityService==null && _loginService!=null)
+ if (_identityService==null && _realmName!=null)
_identityService=new DefaultIdentityService();
}
@@ -469,7 +469,8 @@ public abstract class SecurityHandler extends HandlerWrapper implements Authenti
{
Authentication.User userAuth = (Authentication.User)authentication;
baseRequest.setAuthentication(authentication);
- previousIdentity = _identityService.associate(userAuth.getUserIdentity());
+ if (_identityService!=null)
+ previousIdentity = _identityService.associate(userAuth.getUserIdentity());
if (isAuthMandatory)
{
@@ -483,7 +484,8 @@ public abstract class SecurityHandler extends HandlerWrapper implements Authenti
}
handler.handle(pathInContext, baseRequest, request, response);
- authenticator.secureResponse(request, response, isAuthMandatory, userAuth);
+ if (authenticator!=null)
+ authenticator.secureResponse(request, response, isAuthMandatory, userAuth);
}
else if (authentication instanceof Authentication.Deferred)
{

Back to the top