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

Bug 285119 improve run-as notification to identity service 

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@613 7e9141cc-0065-0410-87d8-b60c137991c4
This commit is contained in:
David Jencks 2009-07-31 23:51:31 +00:00
parent d0f4af9c6b
commit eedde3ce5e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHolder.java
View File

@ -263,7 +263,7 @@ public class ServletHolder extends Holder implements UserIdentity.Scope, Compara
{
try
{
if (_identityService!=null && _runAsToken!=null)
if (_identityService!=null)
old_run_as=_identityService.setRunAs(_identityService.getSystemUserIdentity(),_runAsToken);
destroyInstance(_servlet);
@ -274,7 +274,7 @@ public class ServletHolder extends Holder implements UserIdentity.Scope, Compara
}
finally
{
if (_identityService!=null && _runAsToken!=null)
if (_identityService!=null)
_identityService.unsetRunAs(old_run_as);
}
}
@ -404,7 +404,7 @@ public class ServletHolder extends Holder implements UserIdentity.Scope, Compara
_servlet = getServletHandler().customizeServlet(_servlet);
// Handle run as
if (_identityService!=null && _runAsToken!=null)
if (_identityService!=null)
{
old_run_as=_identityService.setRunAs(_identityService.getSystemUserIdentity(),_runAsToken);
}
@ -435,7 +435,7 @@ public class ServletHolder extends Holder implements UserIdentity.Scope, Compara
finally
{
// pop run-as role
if (_identityService!=null && _runAsToken!=null)
if (_identityService!=null)
_identityService.unsetRunAs(old_run_as);
}
}
@ -512,7 +512,7 @@ public class ServletHolder extends Holder implements UserIdentity.Scope, Compara
request.setAttribute("org.apache.catalina.jsp_file",_forcedPath);
// Handle run as
if (_identityService!=null && _runAsToken!=null)
if (_identityService!=null)
old_run_as=_identityService.setRunAs(baseRequest.getUserIdentity(),_runAsToken);
if (!isAsyncSupported())
@ -531,7 +531,7 @@ public class ServletHolder extends Holder implements UserIdentity.Scope, Compara
baseRequest.setAsyncSupported(suspendable);
// pop run-as role
if (_identityService!=null && _runAsToken!=null)
if (_identityService!=null)
_identityService.unsetRunAs(old_run_as);
// Handle error params.