svn commit: r1081118 - in /tomcat/trunk: java/org/apache/catalina/valves/LocalStrings.properties java/org/apache/catalina/valves/SSLValve.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Sun Mar 13 14:08:05 2011
New Revision: 1081118

URL: http://svn.apache.org/viewvc?rev=1081118&view=rev
Log:
Don't log to standard out

Modified:
    tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
    tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java
    tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties?rev=1081118&r1=1081117&r2=1081118&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties 
(original)
+++ tomcat/trunk/java/org/apache/catalina/valves/LocalStrings.properties Sun 
Mar 13 14:08:05 2011
@@ -41,6 +41,7 @@ errorReportValve.rootCauseInLogs=The ful
 # Remote IP valve
 remoteIpValve.syntax=Invalid regular expressions [{0}] provided.
 
+sslValve.certError=Failed to process certificate string [{0}] to create a 
java.security.cert.X509Certificate object
 sslValve.invalidProvider=The SSL provider specified on the connector 
associated with this request of [{0}] is invalid. The certificate data could 
not be processed.
 
 # HTTP status reports

Modified: tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java?rev=1081118&r1=1081117&r2=1081118&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java (original)
+++ tomcat/trunk/java/org/apache/catalina/valves/SSLValve.java Sun Mar 13 
14:08:05 2011
@@ -109,8 +109,7 @@ public class SSLValve extends ValveBase 
                 jsseCerts = new X509Certificate[1];
                 jsseCerts[0] = cert;
             } catch (java.security.cert.CertificateException e) {
-                System.out.println("SSLValve failed " + strcerts);
-                System.out.println("SSLValve failed " + e);
+                log.warn(sm.getString("sslValve.certError", strcerts), e);
             } catch (NoSuchProviderException e) {
                 log.error(sm.getString(
                         "sslValve.invalidProvider", providerName), e);

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1081118&r1=1081117&r2=1081118&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sun Mar 13 14:08:05 2011
@@ -54,6 +54,9 @@
         Don't unpack WAR files if they are not located in the Host's
         appBase. (markt)
       </fix>
+      <fix>
+        Don&apos;t log to standard out in SSLValve. (markt)
+      </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