You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/05/07 12:32:51 UTC
svn commit: r1678156 - in /tomcat/trunk/java/org/apache/tomcat/util/net:
AbstractJsseEndpoint.java LocalStrings.properties
Author: markt
Date: Thu May 7 10:32:51 2015
New Revision: 1678156
URL: http://svn.apache.org/r1678156
Log:
Fix an i18n TODO
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties
Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java?rev=1678156&r1=1678155&r2=1678156&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java Thu May 7 10:32:51 2015
@@ -67,8 +67,8 @@ public abstract class AbstractJsseEndpoi
SSLHostConfig sslHostConfig = getSSLHostConfig(sniHostName);
SSLContextWrapper sslContextWrapper = (SSLContextWrapper) sslHostConfig.getSslContext();
if (sslContextWrapper == null) {
- // TODO i18n
- throw new IllegalStateException();
+ throw new IllegalStateException(
+ sm.getString("endpoint.jsse.noSslContext", sniHostName));
}
SSLEngine engine = sslContextWrapper.getSSLContext().createSSLEngine();
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=1678156&r1=1678155&r2=1678156&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/LocalStrings.properties Thu May 7 10:32:51 2015
@@ -73,6 +73,7 @@ endpoint.apr.pollError=Poller failed wit
endpoint.apr.pollMergeEvents=Merge poller event [{1}] for socket [{0}] to create merged event [{2}]
endpoint.apr.pollUnknownEvent=A socket was returned from the poller with an unrecognized event [{0}]
endpoint.apr.remoteport=APR socket [{0}] opened with remote port [{1}]
+endpoint.jsse.noSslContext=No SSLContext could be found for the host name [{0}]
endpoint.nio.selectorCloseFail=Failed to close selector when closing the poller
endpoint.nio2.exclusiveExecutor=The NIO2 connector requires an exclusive executor to operate properly on shutdown
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org