diff options
| author | Jesse McConnell | 2012-02-15 19:49:23 +0000 |
|---|---|---|
| committer | Jesse McConnell | 2012-02-15 19:49:23 +0000 |
| commit | 098428dd376bc69657cf08c070bf2c3b3f80494b (patch) | |
| tree | 39a78fef69e0001aaebe903425029c723c7172fa /jetty-security | |
| parent | 68737e7713d429e7eb78a00c35992cf9d21a7d27 (diff) | |
| parent | adeb18093b943d9a5fcdb96af4cd1169ddea4c81 (diff) | |
| download | org.eclipse.jetty.project-098428dd376bc69657cf08c070bf2c3b3f80494b.tar.gz org.eclipse.jetty.project-098428dd376bc69657cf08c070bf2c3b3f80494b.tar.xz org.eclipse.jetty.project-098428dd376bc69657cf08c070bf2c3b3f80494b.zip | |
Merge branch 'master' into jetty-8
Diffstat (limited to 'jetty-security')
| -rw-r--r-- | jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java | 17 |
1 files changed, 10 insertions, 7 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 f6af097880..d6f69bbb91 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 @@ -503,15 +503,18 @@ public abstract class SecurityHandler extends HandlerWrapper implements Authenti previousIdentity = deferred.getPreviousAssociation(); deferred.setIdentityService(null); } - - Authentication auth=baseRequest.getAuthentication(); - if (auth instanceof Authentication.User) + + if (authenticator!=null) { - Authentication.User userAuth = (Authentication.User)auth; - authenticator.secureResponse(request, response, isAuthMandatory, userAuth); + Authentication auth=baseRequest.getAuthentication(); + if (auth instanceof Authentication.User) + { + Authentication.User userAuth = (Authentication.User)auth; + authenticator.secureResponse(request, response, isAuthMandatory, userAuth); + } + else + authenticator.secureResponse(request, response, isAuthMandatory, null); } - else - authenticator.secureResponse(request, response, isAuthMandatory, null); } else { |