Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2012-01-10 02:23:55 -0500
committerJan Bartel2012-01-10 02:23:55 -0500
commit70961bc53b2a40b11e79e595d79ffd52e53478d4 (patch)
tree218ae9488074453c8d68cac26d58d03b4ccc6cdc /jetty-security/src
parent1fbec51c8a1c9bac0bff984c4ded6a4ba32ca73a (diff)
parent31bd00ab794334a0d86d0c73abe09959f8338f2f (diff)
downloadorg.eclipse.jetty.project-70961bc53b2a40b11e79e595d79ffd52e53478d4.tar.gz
org.eclipse.jetty.project-70961bc53b2a40b11e79e595d79ffd52e53478d4.tar.xz
org.eclipse.jetty.project-70961bc53b2a40b11e79e595d79ffd52e53478d4.zip
Merge remote-tracking branch 'origin/master' into jetty-8
Diffstat (limited to 'jetty-security/src')
-rw-r--r--jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java6
-rw-r--r--jetty-security/src/test/java/org/eclipse/jetty/security/ConstraintTest.java4
2 files changed, 2 insertions, 8 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 6a4b837783..7e4232c579 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
@@ -318,13 +318,11 @@ public abstract class SecurityHandler extends HandlerWrapper implements Authenti
if (!_loginServiceShared && _loginService instanceof LifeCycle)
((LifeCycle)_loginService).start();
- System.err.println("authenticator="+_authenticator+" authenticatorFactory="+_authenticatorFactory+" identityService="+_identityService);
if (_authenticator==null && _authenticatorFactory!=null && _identityService!=null)
{
_authenticator=_authenticatorFactory.getAuthenticator(getServer(),ContextHandler.getCurrentContext(),this, _identityService, _loginService);
if (_authenticator!=null)
_authMethod=_authenticator.getAuthMethod();
- System.err.println("Called auth factory, authenticator="+_authenticator);
}
if (_authenticator==null)
@@ -479,7 +477,7 @@ public abstract class SecurityHandler extends HandlerWrapper implements Authenti
deferred.setIdentityService(_identityService);
deferred.setLoginService(_loginService);
baseRequest.setAuthentication(authentication);
-System.err.println("uri="+baseRequest.getUri()+" Auth is deferred");
+
try
{
handler.handle(pathInContext, baseRequest, request, response);
@@ -489,7 +487,7 @@ System.err.println("uri="+baseRequest.getUri()+" Auth is deferred");
previousIdentity = deferred.getPreviousAssociation();
deferred.setIdentityService(null);
}
- System.err.println("Securityhandler calling secureResponse, for Authentication.User");
+
Authentication auth=baseRequest.getAuthentication();
if (auth instanceof Authentication.User)
{
diff --git a/jetty-security/src/test/java/org/eclipse/jetty/security/ConstraintTest.java b/jetty-security/src/test/java/org/eclipse/jetty/security/ConstraintTest.java
index 47190675b6..7fdf357ca7 100644
--- a/jetty-security/src/test/java/org/eclipse/jetty/security/ConstraintTest.java
+++ b/jetty-security/src/test/java/org/eclipse/jetty/security/ConstraintTest.java
@@ -835,11 +835,7 @@ public class ConstraintTest
assertTrue(response.startsWith("HTTP/1.1 200 "));
response = _connector.getResponses("GET /ctx/forbid/post HTTP/1.0\r\n\r\n");
- System.err.println(response);
assertTrue(response.startsWith("HTTP/1.1 200 ")); // This is so stupid, but it is the S P E C
-
-
-
}
private class RequestHandler extends AbstractHandler
{

Back to the top