svn commit: r1737746 - in /tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat: Jre8Compat.java JreCompat.java

[markt]

Author: markt
Date: Mon Apr  4 21:09:31 2016
New Revision: 1737746

URL: http://svn.apache.org/viewvc?rev=1737746&view=rev
Log:
Remove the socket version of setUseCipherOrder since it was only used by BIO 
which has been removed in 8.5.x.

Modified:
    tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/Jre8Compat.java
    tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java

Modified: 
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/Jre8Compat.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/Jre8Compat.java?rev=1737746&r1=1737745&r2=1737746&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/Jre8Compat.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/Jre8Compat.java Mon 
Apr  4 21:09:31 2016
@@ -21,25 +21,18 @@ import java.lang.reflect.Method;
 
 import javax.net.ssl.SSLEngine;
 import javax.net.ssl.SSLParameters;
-import javax.net.ssl.SSLServerSocket;
 
 class Jre8Compat extends JreCompat {
 
-    private static final Method getSSLParametersMethod;
     private static final Method setUseCipherSuitesOrderMethod;
-    private static final Method setSSLParametersMethod;
 
 
     static {
         Method m1 = null;
-        Method m2 = null;
-        Method m3 = null;
         try {
             // Get this class first since it is Java 8+ only
-            Class<?> c2 = Class.forName("javax.net.ssl.SSLParameters");
-            m1 = SSLServerSocket.class.getMethod("getSSLParameters");
-            m2 = c2.getMethod("setUseCipherSuitesOrder", boolean.class);
-            m3 = SSLServerSocket.class.getMethod("setSSLParameters", c2);
+            Class<?> c1 = Class.forName("javax.net.ssl.SSLParameters");
+            m1 = c1.getMethod("setUseCipherSuitesOrder", boolean.class);
         } catch (SecurityException e) {
             // Should never happen
         } catch (NoSuchMethodException e) {
@@ -47,9 +40,7 @@ class Jre8Compat extends JreCompat {
         } catch (ClassNotFoundException e) {
             // Should never happen
         }
-        getSSLParametersMethod = m1;
-        setUseCipherSuitesOrderMethod = m2;
-        setSSLParametersMethod = m3;
+        setUseCipherSuitesOrderMethod = m1;
     }
 
 
@@ -58,25 +49,6 @@ class Jre8Compat extends JreCompat {
     }
 
 
-    @Override
-    public void setUseServerCipherSuitesOrder(SSLServerSocket socket,
-            boolean useCipherSuitesOrder) {
-        try {
-            Object sslParameters = getSSLParametersMethod.invoke(socket);
-            setUseCipherSuitesOrderMethod.invoke(
-                    sslParameters, Boolean.valueOf(useCipherSuitesOrder));
-            setSSLParametersMethod.invoke(socket, sslParameters);
-            return;
-        } catch (IllegalArgumentException e) {
-            throw new UnsupportedOperationException(e);
-        } catch (IllegalAccessException e) {
-            throw new UnsupportedOperationException(e);
-        } catch (InvocationTargetException e) {
-            throw new UnsupportedOperationException(e);
-        }
-    }
-
-
     @Override
     public void setUseServerCipherSuitesOrder(SSLEngine engine,
             boolean useCipherSuitesOrder) {

Modified: tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java?rev=1737746&r1=1737745&r2=1737746&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java 
(original)
+++ tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java Mon 
Apr  4 21:09:31 2016
@@ -17,7 +17,6 @@
 package org.apache.tomcat.util.compat;
 
 import javax.net.ssl.SSLEngine;
-import javax.net.ssl.SSLServerSocket;
 
 import org.apache.tomcat.util.res.StringManager;
 
@@ -60,13 +59,6 @@ public class JreCompat {
     }
 
 
-    @SuppressWarnings("unused")
-    public void setUseServerCipherSuitesOrder(SSLServerSocket socket,
-            boolean useCipherSuitesOrder) {
-        throw new 
UnsupportedOperationException(sm.getString("jreCompat.noServerCipherSuiteOrder"));
-    }
-
-
     @SuppressWarnings("unused")
     public void setUseServerCipherSuitesOrder(SSLEngine engine,
             boolean useCipherSuitesOrder) {



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