jmcnally 02/05/18 20:10:32
Modified: src/java/org/apache/turbine Turbine.java
Log:
remove code that was closing the response writer. There is not much
benefit in doing so, and it can cause problems. E.g. Another servlet
includes the Turbine servlet using a RequestDispatcher. If that
servlet then tries to add more content to the response, it will fail.
Revision Changes Path
1.40 +1 -19 jakarta-turbine-3/src/java/org/apache/turbine/Turbine.java
Index: Turbine.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/Turbine.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- Turbine.java 10 May 2002 22:39:11 -0000 1.39
+++ Turbine.java 19 May 2002 03:10:32 -0000 1.40
@@ -122,7 +122,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Martin Poeschl</a>
- * @version $Id: Turbine.java,v 1.39 2002/05/10 22:39:11 jmcnally Exp $
+ * @version $Id: Turbine.java,v 1.40 2002/05/19 03:10:32 jmcnally Exp $
*/
public class Turbine
extends HttpServlet
@@ -311,8 +311,6 @@
}
finally
{
- closeOutputStream(data);
-
// if the RunData has been added to the request, we assume
// Turbine is being invoked from another servlet that will
// handle returning the RunData.
@@ -348,22 +346,6 @@
public final String getServletInfo()
{
return "Turbine Servlet @VERSION@";
- }
-
- private void closeOutputStream(RunData data)
- {
- // Make sure to close the outputstream when we are done.
- try
- {
- if (data.getOut() != null)
- {
- data.getOut().close();
- }
- }
- catch (Exception e)
- {
- log.debug("closeOutputStream: " + e.getMessage());
- }
}
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
