Author: remy.maucherat(a)jboss.com Date: 2008-07-15 12:08:30 -0400 (Tue, 15 Jul 2008) New Revision: 715 Modified: trunk/java/org/apache/catalina/core/DefaultInstanceManager.java trunk/java/org/apache/catalina/servlets/CGIServlet.java trunk/webapps/docs/changelog.xml Log: - NPE in CGI. - Minor tweak in instance manager. Modified: trunk/java/org/apache/catalina/core/DefaultInstanceManager.java =================================================================== --- trunk/java/org/apache/catalina/core/DefaultInstanceManager.java 2008-07-15 11:53:25 UTC (rev 714) +++ trunk/java/org/apache/catalina/core/DefaultInstanceManager.java 2008-07-15 16:08:30 UTC (rev 715) @@ -50,7 +50,7 @@ import org.apache.catalina.util.StringManager; /** - * @version $Rev:$ $Date:$ + * @version $Rev$ $Date$ */ public class DefaultInstanceManager implements InstanceManager { @@ -336,7 +336,7 @@ } protected Class loadClass(String className, ClassLoader classLoader) throws ClassNotFoundException { - if (className.startsWith("org.apache.catalina")) { + if (className.startsWith("org.apache.catalina") || className.startsWith("org.jboss.web")) { return containerClassLoader.loadClass(className); } try { Modified: trunk/java/org/apache/catalina/servlets/CGIServlet.java =================================================================== --- trunk/java/org/apache/catalina/servlets/CGIServlet.java 2008-07-15 11:53:25 UTC (rev 714) +++ trunk/java/org/apache/catalina/servlets/CGIServlet.java 2008-07-15 16:08:30 UTC (rev 715) @@ -1726,15 +1726,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: trunk/webapps/docs/changelog.xml =================================================================== --- trunk/webapps/docs/changelog.xml 2008-07-15 11:53:25 UTC (rev 714) +++ trunk/webapps/docs/changelog.xml 2008-07-15 16:08:30 UTC (rev 715) @@ -39,6 +39,12 @@ <fix> <bug>42678</bug>: Only ignore docBase it it really is a subdir of appBase. (markt) </fix> + <fix> + <bug>42722</bug>: Fix possible NPE in CGI. (markt) + </fix> + <fix> + org.jboss.web should be loaded as container classes. (remm) + </fix> </changelog> </subsection> <subsection name="Jasper"> @@ -49,6 +55,13 @@ </fix> </changelog> </subsection> + <subsection name="Native"> + <changelog> + <fix> + Remove system.out. (jfclere) + </fix> + </changelog> + </subsection> </section> <section name="JBoss Web 2.1.1.CR4 (remm)">