Don't log to standard out

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1081118 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/valves/LocalStrings.properties b/java/org/apache/catalina/valves/LocalStrings.properties
index 7317e63..56e5c51 100644 (file)
--- a/java/org/apache/catalina/valves/LocalStrings.properties
+++ b/java/org/apache/catalina/valves/LocalStrings.properties
@@ -41,6 +41,7 @@ errorReportValve.rootCauseInLogs=The full stack trace of the root cause is avail
 # 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

diff --git a/java/org/apache/catalina/valves/SSLValve.java b/java/org/apache/catalina/valves/SSLValve.java
index c023220..2ad9be0 100644 (file)
--- a/java/org/apache/catalina/valves/SSLValve.java
+++ b/java/org/apache/catalina/valves/SSLValve.java
@@ -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);

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 48a5b1d..33561ac 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -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">