svn commit: r772872 - in /tomcat/trunk/java/org/apache/catalina/loader: LocalStrings.properties WebappClassLoader.java

[pero]

Author: pero
Date: Fri May  8 07:40:59 2009
New Revision: 772872

URL: http://svn.apache.org/viewvc?rev=772872view=rev
Log:
close stream after error

Modified:
tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java

Modified: tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties?rev=772872r1=772871r2=772872view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/LocalStrings.properties Fri 
May  8 07:40:59 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/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=772872r1=772871r2=772872view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Fri May 
 8 07:40:59 2009
@@ -2097,15 +2097,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 {



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r772875 - /tomcat/tc6.0.x/trunk/STATUS.txt

[pero]

Author: pero
Date: Fri May  8 07:48:28 2009
New Revision: 772875

URL: http://svn.apache.org/viewvc?rev=772875view=rev
Log:
add backport fix

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=772875r1=772874r2=772875view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Fri May  8 07:48:28 2009
@@ -144,4 +144,10 @@
   Update Windows installer to work automatically on 64-bit machines
   http://svn.apache.org/viewvc?view=revrevision=770876
   +1: markt, pero
-  -1: 
+  -1:
+
+* Fix Close Stream at WebappClassLoader after read error
+  http://svn.apache.org/viewvc?rev=772872view=rev 
+  +1: pero
+  -1:
+



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: [ANN] New committer: Konstantin Kolinko

[Peter Roßbach]

Hello Konstantin,

Great work and very welcome in the tomcat team.

Regards,

Peter

Am 06.05.2009 um 09:52 schrieb Mark Thomas:

On behalf of the Tomcat committers I am pleased to announce that  
Konstantin

Kolinko has been voted in as a new Tomcat committer.

Please join me in welcoming him.

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

[Tomcat Wiki] Update of FAQ/CharacterEncoding by DouglasBirdzell

[Apache Wiki]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on Tomcat Wiki for change 
notification.

The following page has been changed by DouglasBirdzell:
http://wiki.apache.org/tomcat/FAQ/CharacterEncoding

--
   1. Change all your JSPs to set the correct `Content-Type` (use `%...@page 
cotnentType=mime/type; charset=UTF-8 %`)
   1. Change all your servlets to set the content type for responses to UTF-8
   1. Change any content-generation libraries you use (Velocity, Freemarker, 
etc.) to use UTF-8 as the content type
+  1. Disable any valves or filters that may read request parameters before 
your character encoding filter or jsp page has a chance to set the encoding to 
UTF-8.  For more information see 
http://www.mail-archive.com/us...@tomcat.apache.org/msg21117.html.
  
  [[Anchor(Q9)]]'''Why does everything have to be this way?'''
  

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org