Author: markt
Date: Mon Sep 21 19:11:38 2015
New Revision: 1704388
URL: http://svn.apache.org/viewvc?rev=1704388&view=rev
Log:
Add missing error handling
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties?rev=1704388&r1=1704387&r2=1704388&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties Mon
Sep 21 19:11:38 2015
@@ -118,5 +118,6 @@ socket.apr.write.error=Unexpected error
socket.apr.closed=The socket [{0}] associated with this connection has been
closed.
sslHostConfig.certificateVerificationInvalid=The certificate verification
value [{0}] is not recognised
+sslHostConfig.certificate.notype=Multiple certificates were specified and at
least one is missing the required attribute type
sslHostConfig.mismatch=The property [{0}] was set on the SSLHostConfig named
[{1}] and is for connectors of type [{2}] but the SSLHostConfig is being used
with a connector of type [{3}]
sslHostConfig.prefix_missing=The protocol [{0}] was added to the list of
protocols on the SSLHostConfig named [{1}]. Check if a +/- prefix is missing.
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java?rev=1704388&r1=1704387&r2=1704388&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java Mon Sep 21
19:11:38 2015
@@ -169,6 +169,7 @@ public class SSLHostConfig {
certificates.iterator().next().getType() ==
SSLHostConfigCertificate.Type.UNDEFINED ||
certificate.getType() ==
SSLHostConfigCertificate.Type.UNDEFINED) {
// Invalid config
+ throw new
IllegalArgumentException(sm.getString("sslHostConfig.certificate.notype"));
}
certificates.add(certificate);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
