From f7a6129657283b33d1488fe01aae7f010d214212 Mon Sep 17 00:00:00 2001 From: Luke Taylor Date: Tue, 28 Aug 2007 22:40:56 +0000 Subject: [PATCH] SEC-539: Removed unnecessary check for a null request object. Removed unnecessary catch/rethrow of IOException and ServletException from try/finally around chain.doFilter. --- .../context/HttpSessionContextIntegrationFilter.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/org/acegisecurity/context/HttpSessionContextIntegrationFilter.java b/core/src/main/java/org/acegisecurity/context/HttpSessionContextIntegrationFilter.java index 1068a1c02c..c3697386ae 100644 --- a/core/src/main/java/org/acegisecurity/context/HttpSessionContextIntegrationFilter.java +++ b/core/src/main/java/org/acegisecurity/context/HttpSessionContextIntegrationFilter.java @@ -192,7 +192,7 @@ public class HttpSessionContextIntegrationFilter implements InitializingBean, Fi public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException { - if ((request != null) && (request.getAttribute(FILTER_APPLIED) != null)) { + if (request.getAttribute(FILTER_APPLIED) != null) { // ensure that filter is only applied once per request chain.doFilter(request, response); @@ -235,14 +235,10 @@ public class HttpSessionContextIntegrationFilter implements InitializingBean, Fi request.setAttribute(FILTER_APPLIED, Boolean.TRUE); - // Proceed with chain + // Proceed with chain try { chain.doFilter(request, response); - } catch (IOException ioe) { - throw ioe; - } catch (ServletException se) { - throw se; } finally { // This is the only place in this class where SecurityContextHolder.getContext() is called