[utilities COMMIT] in /java-support/trunk: doc/RELEASE-NOTES.txt src/main/java/net/shibboleth/utilities/java/support/...

[noreply at shibboleth.net]

Author: scantor
Date: Tue Nov  5 13:20:08 2013
New Revision: 476

URL: http://svn.shibboleth.net/view/utilities?rev=476&view=rev
Log:
JSPT-36: Cookie filter doesn't catch all the output generating methods 

Modified:
    java-support/trunk/doc/RELEASE-NOTES.txt
    java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/CookieBufferingFilter.java

Modified: java-support/trunk/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/doc/RELEASE-NOTES.txt?rev=476&r1=475&r2=476&view=diff
==============================================================================
--- java-support/trunk/doc/RELEASE-NOTES.txt (original)
+++ java-support/trunk/doc/RELEASE-NOTES.txt Tue Nov  5 13:20:08 2013
@@ -1,3 +1,6 @@
+Changes since Release 2.0.0
+[JSPT-36] -  Cookie filter doesn't catch all the output generating methods
+
 Changes in Release 2.0.0
 ===============================
 [JSPT-3] - Providers helpers for dealing with idle connections in HttpClient

Modified: java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/CookieBufferingFilter.java
URL: http://svn.shibboleth.net/view/utilities/java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/CookieBufferingFilter.java?rev=476&r1=475&r2=476&view=diff
==============================================================================
--- java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/CookieBufferingFilter.java (original)
+++ java-support/trunk/src/main/java/net/shibboleth/utilities/java/support/net/CookieBufferingFilter.java Tue Nov  5 13:20:08 2013
@@ -66,12 +66,7 @@
             throw new ServletException("Response is not an instance of HttpServletResponse");
         }
 
-        CookieBufferingHttpServletResponseProxy responseProxy =
-                new CookieBufferingHttpServletResponseProxy((HttpServletResponse) response);
-        chain.doFilter(request, responseProxy);
-        
-        // Dump all the cookies set into the real response if not done already.
-        responseProxy.dumpCookies();
+        chain.doFilter(request, new CookieBufferingHttpServletResponseProxy((HttpServletResponse) response));
     }
 
     /**
@@ -94,6 +89,7 @@
         }
     
         /** {@inheritDoc} */
+        @Override
         public void addCookie(Cookie cookie) {
             // Guarantees any existing cookie by this name is replaced.
             cookieMap.put(cookie.getName(), cookie);
@@ -109,17 +105,40 @@
         }
 
         /** {@inheritDoc} */
+        @Override
         public ServletOutputStream getOutputStream() throws IOException {
             dumpCookies();
             return super.getOutputStream();
         }
 
         /** {@inheritDoc} */
+        @Override
         public PrintWriter getWriter() throws IOException {
             dumpCookies();
             return super.getWriter();
         }
 
+        /** {@inheritDoc} */
+        @Override
+        public void sendError(int sc, String msg) throws IOException {
+            dumpCookies();
+            super.sendError(sc, msg);
+        }
+
+        /** {@inheritDoc} */
+        @Override
+        public void sendError(int sc) throws IOException {
+            dumpCookies();
+            super.sendError(sc);
+        }
+
+        /** {@inheritDoc} */
+        @Override
+        public void sendRedirect(String location) throws IOException {
+            dumpCookies();
+            super.sendRedirect(location);
+        }
+        
         /**
          * Transfer cookies added into the real response.
          */