Update of /var/cvs/src/org/mmbase/util
In directory james.mmbase.org:/tmp/cvs-serv24336

Modified Files:
      Tag: MMBase-1_8
        GenericResponseWrapper.java 
Log Message:
Fix for   MMB-1602. Thanks to Martin Sturm.


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util
See also: http://www.mmbase.org/jira/browse/MMB-1602


Index: GenericResponseWrapper.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/GenericResponseWrapper.java,v
retrieving revision 1.17.2.3
retrieving revision 1.17.2.4
diff -u -b -r1.17.2.3 -r1.17.2.4
--- GenericResponseWrapper.java 16 Oct 2007 15:22:54 -0000      1.17.2.3
+++ GenericResponseWrapper.java 20 Feb 2008 11:59:21 -0000      1.17.2.4
@@ -28,7 +28,7 @@
  * @author Johannes Verelst
  * @author Michiel Meeuwissen
  * @since MMBase-1.7
- * @version $Id: GenericResponseWrapper.java,v 1.17.2.3 2007/10/16 15:22:54 
michiel Exp $
+ * @version $Id: GenericResponseWrapper.java,v 1.17.2.4 2008/02/20 11:59:21 
michiel Exp $
  */
 public class GenericResponseWrapper extends HttpServletResponseWrapper {
     private static final Logger log = 
Logging.getLoggerInstance(GenericResponseWrapper.class);
@@ -87,8 +87,12 @@
     public HttpServletResponse getHttpServletResponse() {
         //return (HttpServletResponse) getResponse(); // shoudl work, I think, 
but doesn't
         HttpServletResponse response = wrappedResponse;
-        while (response instanceof GenericResponseWrapper) { // if this 
happens in an 'mm:included' page.
+        while (response instanceof HttpServletResponseWrapper) {
+            if (response instanceof GenericResponseWrapper) { // if this 
happens in an 'mm:included' page.
             response = ((GenericResponseWrapper) response).wrappedResponse;
+            } else {
+                response = (HttpServletResponse) ((HttpServletResponseWrapper) 
response).getResponse();
+            }
         }
         return response;
     }
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to