Author: violetagg
Date: Wed Mar 29 11:12:33 2017
New Revision: 1789335
URL: http://svn.apache.org/viewvc?rev=1789335&view=rev
Log:
javax.net.ssl.SSLParameters exists since Java 6, but the method
setUseCipherSuitesOrder exists since Java 8.
Make this clear in the comments.
This closes apache/tomcat85#8
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/compat/Jre8Compat.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
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=1789335&r1=1789334&r2=1789335&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 Wed
Mar 29 11:12:33 2017
@@ -30,8 +30,9 @@ class Jre8Compat extends JreCompat {
static {
Method m1 = null;
try {
- // Get this class first since it is Java 8+ only
+ // The class is Java6+...
Class<?> c1 = Class.forName("javax.net.ssl.SSLParameters");
+ // ...but this method is Java8+
m1 = c1.getMethod("setUseCipherSuitesOrder", boolean.class);
} catch (SecurityException e) {
// Should never happen
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1789335&r1=1789334&r2=1789335&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Wed Mar 29 11:12:33 2017
@@ -60,6 +60,14 @@
</update>
</changelog>
</subsection>
+ <subsection name="Other">
+ <changelog>
+ <fix>
+ Correct comments about Java 8 in <code>Jre8Compat</code>.
+ Patch provided by fibbers via Github. (violetagg)
+ </fix>
+ </changelog>
+ </subsection>
</section>
<section name="Tomcat 8.5.13 (markt)" rtext="release in progress">
<subsection name="Catalina">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
