Author: markt
Date: Tue Apr 14 19:26:22 2015
New Revision: 1673533
URL: http://svn.apache.org/r1673533
Log:
Fix broken test
Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
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=1673533&r1=1673532&r2=1673533&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AbstractJsseEndpoint.java Tue
Apr 14 19:26:22 2015
@@ -42,6 +42,14 @@ public abstract class AbstractJsseEndpoi
if (isSSLEnabled()) {
sslImplementation =
SSLImplementation.getInstance(getSslImplementationName());
+ // TODO: Temp code until config refactoring is complete. Remove
once
+ // refactoring is complete.
+ if (sslHostConfigs.size() == 0) {
+ SSLHostConfig defaultSslHostConfig = new SSLHostConfig();
+
defaultSslHostConfig.setHostName(SSLHostConfig.DEFAULT_SSL_HOST_NAME);
+ sslHostConfigs.put(SSLHostConfig.DEFAULT_SSL_HOST_NAME,
defaultSslHostConfig);
+ }
+
for (SSLHostConfig sslHostConfig : sslHostConfigs.values()) {
SSLUtil sslUtil = sslImplementation.getSSLUtil(this,
sslHostConfig);
SSLContext sslContext = sslUtil.createSSLContext();
@@ -122,16 +130,21 @@ public abstract class AbstractJsseEndpoi
private SSLContextWrapper getSSLContextWrapper(String sniHostName) {
- // First choice - direct match
- SSLContextWrapper result = sslContexts.get(sniHostName);
- if (result != null) {
- return result;
- }
- // Second choice, wildcard match
- int indexOfDot = sniHostName.indexOf('.');
- if (indexOfDot > -1) {
- result = sslContexts.get("*" + sniHostName.substring(indexOfDot));
+ SSLContextWrapper result = null;
+
+ if (sniHostName != null) {
+ // First choice - direct match
+ result = sslContexts.get(sniHostName);
+ if (result != null) {
+ return result;
+ }
+ // Second choice, wildcard match
+ int indexOfDot = sniHostName.indexOf('.');
+ if (indexOfDot > -1) {
+ result = sslContexts.get("*" +
sniHostName.substring(indexOfDot));
+ }
}
+
// Fall-back. Use the default
if (result == null) {
result = sslContexts.get(SSLHostConfig.DEFAULT_SSL_HOST_NAME);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
