svn commit: r1712002 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AprEndpoint.java SSLHostConfig.java

[markt]

Author: markt
Date: Mon Nov  2 13:50:40 2015
New Revision: 1712002

URL: http://svn.apache.org/viewvc?rev=1712002&view=rev
Log:
Implement review comments from kkolinko on the original fix for BZ 58566
Use correct type for return value and avoid unnecessary casts

Modified:
    tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
    tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=1712002&r1=1712001&r2=1712002&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Mon Nov  2 
13:50:40 2015
@@ -542,7 +542,7 @@ public class AprEndpoint extends Abstrac
                 sslHostConfig.setOpenSslContext(Long.valueOf(ctx));
             }
             SSLHostConfig defaultSSLHostConfig = 
sslHostConfigs.get(getDefaultSSLHostConfigName());
-            Long defaultSSLContext = (Long) 
defaultSSLHostConfig.getOpenSslContext();
+            Long defaultSSLContext = defaultSSLHostConfig.getOpenSslContext();
             sslContext = defaultSSLContext.longValue();
             SSLContext.registerDefault(defaultSSLContext, this);
         }
@@ -552,7 +552,7 @@ public class AprEndpoint extends Abstrac
     @Override
     public long getSslContext(String sniHostName) {
         SSLHostConfig sslHostConfig = getSSLHostConfig(sniHostName);
-        Long ctx = (Long) sslHostConfig.getOpenSslContext();
+        Long ctx = sslHostConfig.getOpenSslContext();
         if (ctx != null) {
             return ctx.longValue();
         }

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=1712002&r1=1712001&r2=1712002&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/SSLHostConfig.java Mon Nov  2 
13:50:40 2015
@@ -107,7 +107,7 @@ public class SSLHostConfig {
     }
 
 
-    public Object getOpenSslContext() {
+    public Long getOpenSslContext() {
         return openSslContext;
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org