You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by dd...@apache.org on 2005/07/23 06:14:41 UTC
svn commit: r224439 -
/portals/pluto/trunk/container/src/java/org/apache/pluto/core/impl/PortletResponseImpl.java
Author: ddewolf
Date: Fri Jul 22 21:14:38 2005
New Revision: 224439
URL: http://svn.apache.org/viewcvs?rev=224439&view=rev
Log:
PLUTO-128 Patch reviewed and modified version applied. Thank you Eric Dalquist.
Modified:
portals/pluto/trunk/container/src/java/org/apache/pluto/core/impl/PortletResponseImpl.java
Modified: portals/pluto/trunk/container/src/java/org/apache/pluto/core/impl/PortletResponseImpl.java
URL: http://svn.apache.org/viewcvs/portals/pluto/trunk/container/src/java/org/apache/pluto/core/impl/PortletResponseImpl.java?rev=224439&r1=224438&r2=224439&view=diff
==============================================================================
--- portals/pluto/trunk/container/src/java/org/apache/pluto/core/impl/PortletResponseImpl.java (original)
+++ portals/pluto/trunk/container/src/java/org/apache/pluto/core/impl/PortletResponseImpl.java Fri Jul 22 21:14:38 2005
@@ -270,10 +270,15 @@
if (wrappedWriter == null)
{
- wrappedWriter = new PrintWriterServletOutputStream(
- _getHttpServletResponse().getWriter(),
- _getHttpServletResponse().getCharacterEncoding()
- );
+ try {
+ wrappedWriter = _getHttpServletResponse().getOutputStream();
+ }
+ catch(IllegalStateException ise) {
+ wrappedWriter = new PrintWriterServletOutputStream(
+ _getHttpServletResponse().getWriter(),
+ _getHttpServletResponse().getCharacterEncoding()
+ );
+ }
}
usingStream = true;