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

Modified Files:
        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.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- GenericResponseWrapper.java 6 Dec 2007 08:23:32 -0000       1.21
+++ GenericResponseWrapper.java 20 Feb 2008 12:01:49 -0000      1.22
@@ -28,7 +28,7 @@
  * @author Johannes Verelst
  * @author Michiel Meeuwissen
  * @since MMBase-1.7
- * @version $Id: GenericResponseWrapper.java,v 1.21 2007/12/06 08:23:32 
michiel Exp $
+ * @version $Id: GenericResponseWrapper.java,v 1.22 2008/02/20 12:01:49 
michiel Exp $
  */
 public class GenericResponseWrapper extends HttpServletResponseWrapper {
     private static final Logger log = 
Logging.getLoggerInstance(GenericResponseWrapper.class);
@@ -86,8 +86,12 @@
     public HttpServletResponse getHttpServletResponse() {
         //return (HttpServletResponse) getResponse(); // should 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