Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

JETTY-1549 jetty-maven-plugin fails to reload the LoginService properly

This commit is contained in:
Jan Bartel 2012-11-05 14:58:53 +11:00
parent 0c84eefdcc
commit 69cf9285c6
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
jetty-security/src/main/java/org/eclipse/jetty/security/SecurityHandler.java
View File

@ -74,6 +74,8 @@ public abstract class SecurityHandler extends HandlerWrapper implements Authenti
private LoginService _loginService;
private IdentityService _identityService;
private boolean _renewSession=true;
private boolean _discoveredIdentityService = false;
private boolean _discoveredLoginService = false;
/* ------------------------------------------------------------ */
protected SecurityHandler()
@ -338,7 +340,10 @@ public abstract class SecurityHandler extends HandlerWrapper implements Authenti
// many different ways these can be constructed and injected.
if (_loginService==null)
{
setLoginService(findLoginService());
_discoveredLoginService = true;
}
if (_identityService==null)
{
@ -350,6 +355,7 @@ public abstract class SecurityHandler extends HandlerWrapper implements Authenti
if (_identityService==null && _realmName!=null)
setIdentityService(new DefaultIdentityService());
_discoveredIdentityService = true;
}
if (_loginService!=null)
@ -375,6 +381,26 @@ public abstract class SecurityHandler extends HandlerWrapper implements Authenti
super.doStart();
}
@Override
protected void doStop() throws Exception
{
//if we discovered the services (rather than had them explicitly configured), remove them.
if (_discoveredIdentityService)
{
removeBean(_identityService);
_identityService = null;
}
if (_discoveredLoginService)
{
removeBean(_loginService);
_loginService = null;
}
super.doStop();
}
/* ------------------------------------------------------------ */
protected boolean checkSecurity(Request request)
{