Author: remm
Date: Tue Apr 5 13:42:39 2016
New Revision: 1737836
URL: http://svn.apache.org/viewvc?rev=1737836&view=rev
Log:
SSL init always uses the method, which will make it unusable from Java 7 (as
seen in CI runs). IMO this method is fine as a noop, but I'll leave that as a
fixme for consideration.
Modified:
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/JreCompat.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java?rev=1737836&r1=1737835&r2=1737836&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 Tue
Apr 5 13:42:39 2016
@@ -62,7 +62,8 @@ public class JreCompat {
@SuppressWarnings("unused")
public void setUseServerCipherSuitesOrder(SSLEngine engine,
boolean useCipherSuitesOrder) {
- throw new
UnsupportedOperationException(sm.getString("jreCompat.noServerCipherSuiteOrder"));
+ // FIXME: Diasabled for now as it i always called during SSL init,
which makes it fail on Java 7
+ //throw new
UnsupportedOperationException(sm.getString("jreCompat.noServerCipherSuiteOrder"));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]