Author: kkolinko Date: Sun Nov 15 12:28:04 2009 New Revision: 836348 URL: http://svn.apache.org/viewvc?rev=836348&view=rev Log: Close resource Stream in WebappClassLoader after read error It is Peter Rossbach's patch from tc6.0.x
Modified: tomcat/tc5.5.x/trunk/STATUS.txt tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/LocalStrings.properties tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Modified: tomcat/tc5.5.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=836348&r1=836347&r2=836348&view=diff ============================================================================== --- tomcat/tc5.5.x/trunk/STATUS.txt (original) +++ tomcat/tc5.5.x/trunk/STATUS.txt Sun Nov 15 12:28:04 2009 @@ -177,11 +177,6 @@ +1: rjung, markt, mturk -1: -* Fix Close Stream at WebappClassLoader after read error - http://svn.apache.org/viewvc?rev=832351&view=rev - +1: kkolinko, markt, mturk - -1: - * Fix CVE-2009-3548 - Windows installer uses insecure default password http://svn.apache.org/viewvc?rev=834047&view=rev +1: markt, mturk Modified: tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/LocalStrings.properties URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/LocalStrings.properties?rev=836348&r1=836347&r2=836348&view=diff ============================================================================== --- tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/LocalStrings.properties (original) +++ tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/LocalStrings.properties Sun Nov 15 12:28:04 2009 @@ -29,6 +29,7 @@ standardLoader.starting=Starting this Loader standardLoader.stopping=Stopping this Loader webappClassLoader.stopped=Illegal access: this web application instance has been stopped already. Could not load {0}. The eventual following stack trace is caused by an error thrown for debugging purposes as well as to attempt to terminate the thread which caused the illegal access, and has no functional impact. +webappClassLoader.readError=Resource read error: Could not load {0}. webappClassLoader.wrongVersion=(unable to load class {0}) webappLoader.addRepository=Adding repository {0} webappLoader.deploy=Deploying class repositories to work directory {0} Modified: tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java?rev=836348&r1=836347&r2=836348&view=diff ============================================================================== --- tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java (original) +++ tomcat/tc5.5.x/trunk/container/catalina/src/share/org/apache/catalina/loader/WebappClassLoader.java Sun Nov 15 12:28:04 2009 @@ -2150,15 +2150,14 @@ break; pos += n; } - binaryStream.close(); } catch (IOException e) { - e.printStackTrace(); - return null; - } catch (Exception e) { - e.printStackTrace(); + log.error(sm.getString("webappClassLoader.readError", name), e); return null; + } finally { + try { + binaryStream.close(); + } catch (IOException e) {} } - if (fileNeedConvert) { String str = new String(binaryContent,0,pos); try { Modified: tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml URL: http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml?rev=836348&r1=836347&r2=836348&view=diff ============================================================================== --- tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml (original) +++ tomcat/tc5.5.x/trunk/container/webapps/docs/changelog.xml Sun Nov 15 12:28:04 2009 @@ -82,6 +82,9 @@ Add an additional permission required by JULI when running under newer JDKs and a security manager. (markt) </fix> + <fix> + Close resource stream in WebappClassLoader after read error. (pero) + </fix> </changelog> </subsection> <subsection name="Coyote"> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org