markt 2004/06/16 11:22:20
Modified: catalina/src/share/org/apache/catalina/servlets
CGIServlet.java
Log:
Fix NPE introduced in last change.
Revision Changes Path
1.22 +11 -7
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
Index: CGIServlet.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- CGIServlet.java 15 Jun 2004 23:13:57 -0000 1.21
+++ CGIServlet.java 16 Jun 2004 18:22:20 -0000 1.22
@@ -1782,8 +1782,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]
