markt 2004/06/16 11:21:54
Modified: catalina/src/share/org/apache/catalina/servlets
CGIServlet.java
Log:
Fix NPE introduced in last change.
Revision Changes Path
1.24 +13 -9
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
Index: CGIServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- CGIServlet.java 15 Jun 2004 23:13:04 -0000 1.23
+++ CGIServlet.java 16 Jun 2004 18:21:54 -0000 1.24
@@ -1833,8 +1833,12 @@
}
}
} //replacement for Process.waitFor()
- commandsStdOut.close();
- cgiOutput.close();
+ // Close the output stream used
+ if (isBinaryContent) {
+ cgiOutput.close();
+ } else {
+ commandsStdOut.close();
+ }
}
private void sendToLog(BufferedReader rdr) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
