Author: markt
Date: Thu Jul 17 13:37:29 2008
New Revision: 677714
URL: http://svn.apache.org/viewvc?rev=677714&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42722
Possible NPE in CGI Servlet
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=677714&r1=677713&r2=677714&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Jul 17 13:37:29 2008
@@ -56,12 +56,6 @@
+1: markt, remm, fhanik
-1:
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42722
- Possible NPE in CGI Servlet
- http://people.apache.org/~markt/patches/2008-07-15-bug42722.patch
- +1: markt, remm, fhanik
- -1:
-
* Fix comet behavior
Invoke READ when there is a body and make sure END is called if
CometEvent.close is called during an invokation
http://svn.apache.org/viewvc?rev=677473&view=rev
Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java?rev=677714&r1=677713&r2=677714&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java Thu
Jul 17 13:37:29 2008
@@ -1727,15 +1727,20 @@
}
}
} //replacement for Process.waitFor()
-
- // Close the output stream used
- cgiOutput.close();
}
catch (IOException e){
log ("Caught exception " + e);
throw e;
}
finally{
+ // Close the output stream if used
+ if (cgiOutput != null) {
+ try {
+ cgiOutput.close();
+ } catch (IOException ioe) {
+ log ("Exception closing output stream " + ioe);
+ }
+ }
if (debug > 4) {
log ("Running finally block");
}
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=677714&r1=677713&r2=677714&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Jul 17 13:37:29 2008
@@ -39,6 +39,9 @@
<bug>42678</bug>: Only ignore docBase it it really is a subdir of
appBase. Patch provided by juergen. (markt)
</fix>
+ <fix>
+ <bug>42722</bug>: Possible NPE in CGI Servlet. (markt)
+ </fix>
<update>
<bug>45285</bug>: Look for annotations in class hierarchy. (markt)
</update>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
