Am 26. Januar 2015 20:12:09 MEZ, schrieb Konstantin Kolinko <knst.koli...@gmail.com>: >2015-01-26 21:05 GMT+03:00 <fschumac...@apache.org>: >> Author: fschumacher >> Date: Mon Jan 26 18:05:06 2015 >> New Revision: 1654852 >> >> URL: http://svn.apache.org/r1654852 >> Log: >> Log failure to close a resource instead of ignoring it silently. >> >> Modified: >> tomcat/trunk/java/org/apache/catalina/servlets/CGIServlet.java >> >tomcat/trunk/java/org/apache/catalina/servlets/DefaultServlet.java >> >tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java >> >tomcat/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties >> > >> Modified: >tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java >> URL: >http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=1654852&r1=1654851&r2=1654852&view=diff >> >============================================================================== >> --- >tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java >(original) >> +++ >tomcat/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java >Mon Jan 26 18:05:06 2015 >> @@ -176,7 +176,8 @@ public class JSSESocketFactory implement >> } finally { >> try { >> socket.close(); >> - } catch (IOException ignore) { >> + } catch (IOException e) { >> + log.warn(sm.getString("jsse.exceptionOnClose", >"socket"), e); > >-1. Such substitution (passing "socket" as "{0}") really cannot be >localized.
Ok. Will change it. I thought it would be nice to have a generic message which could take the name of the variable. Felix > >> } >> } >> } >> >> Modified >tomcat/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties >> URL: >http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties?rev=1654852&r1=1654851&r2=1654852&view=diff >> >============================================================================== >> --- >tomcat/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties >(original) >> +++ >tomcat/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties >Mon Jan 26 18:05:06 2015 >> @@ -27,6 +27,7 @@ jsse.unsupported_protocols=Some specifie >> jsse.excludeDefaultProtocol=The SSL protocol [{0}] which is enabled >by default in this JRE was excluded from the defaults used by Tomcat >> jsse.noDefaultCiphers=Unable to determine a default for ciphers for >[{0}]. Set an explicit value to ensure the connector can start. >> jsse.noDefaultProtocols=Unable to determine a default for >sslEnabledProtocols for [{0}]. Set an explicit value to ensure the >connector can start. >> +jsse.exceptionOnClose=Failure to close {0}. >> jsseSupport.clientCertError=Error trying to obtain a certificate >from the client >> jseeSupport.certTranslationError=Error translating certificate [{0}] >> jsseSupport.noCertWant=No client certificate sent for want >> >> >> >> --------------------------------------------------------------------- >> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >> For additional commands, e-mail: dev-h...@tomcat.apache.org >> > >--------------------------------------------------------------------- >To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org >For additional commands, e-mail: dev-h...@tomcat.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
