Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Bartel2012-11-05 01:27:49 -0500
committerJan Bartel2012-11-05 01:27:49 -0500
commit2acdf9f839ff56b87fb0b85112b62c976508dce1 (patch)
tree9d79bbd5687286326b4995b4ed3a6ee0b68d8e15 /jetty-security/src
parent69cf9285c61e6210ecfd018c177ca4d7ec6143dd (diff)
parentf3af8c86505bd01ad24db940a252fddc6dff8a10 (diff)
downloadorg.eclipse.jetty.project-2acdf9f839ff56b87fb0b85112b62c976508dce1.tar.gz
org.eclipse.jetty.project-2acdf9f839ff56b87fb0b85112b62c976508dce1.tar.xz
org.eclipse.jetty.project-2acdf9f839ff56b87fb0b85112b62c976508dce1.zip
Merge remote-tracking branch 'origin/jetty-8'
Conflicts: jetty-client/src/test/java/org/eclipse/jetty/client/WebSocketUpgradeTest.java jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java jetty-server/src/main/java/org/eclipse/jetty/server/session/HashSessionManager.java jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketConnectionD00.java jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketFactory.java jetty-websocket/src/main/java/org/eclipse/jetty/websocket/WebSocketServlet.java jetty-websocket/src/test/java/org/eclipse/jetty/websocket/SafariWebsocketDraft0Test.java jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketLoadD08Test.java jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketLoadRFC6455Test.java jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageD00Test.java jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageD06Test.java jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketMessageD08Test.java jetty-websocket/src/test/java/org/eclipse/jetty/websocket/WebSocketServletRFCTest.java
Diffstat (limited to 'jetty-security/src')
-rw-r--r--jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java4
1 files changed, 3 insertions, 1 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 c0fdaccf31..785feb4e19 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
@@ -70,7 +70,7 @@ public abstract class SecurityHandler extends HandlerWrapper implements Authenti
private Authenticator.Factory _authenticatorFactory=new DefaultAuthenticatorFactory();
private String _realmName;
private String _authMethod;
- private final Map<String,String> _initParameters=new HashMap<>();
+ private final Map<String,String> _initParameters=new HashMap<String,String>();
private LoginService _loginService;
private IdentityService _identityService;
private boolean _renewSession=true;
@@ -355,6 +355,7 @@ public abstract class SecurityHandler extends HandlerWrapper implements Authenti
if (_identityService==null && _realmName!=null)
setIdentityService(new DefaultIdentityService());
+
_discoveredIdentityService = true;
}
@@ -382,6 +383,7 @@ public abstract class SecurityHandler extends HandlerWrapper implements Authenti
}
@Override
+ /* ------------------------------------------------------------ */
protected void doStop() throws Exception
{
//if we discovered the services (rather than had them explicitly configured), remove them.

Back to the top