Author: markt
Date: Thu Mar 31 09:41:24 2016
New Revision: 1737211
URL: http://svn.apache.org/viewvc?rev=1737211&view=rev
Log:
Tomcat 8 has a minimum Java version of 7 so the Jre7Compat class can be removed
Removed:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/compat/Jre7Compat.java
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/compat/Jre8Compat.java
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java
Modified:
tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/compat/Jre8Compat.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/compat/Jre8Compat.java?rev=1737211&r1=1737210&r2=1737211&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/compat/Jre8Compat.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/compat/Jre8Compat.java Thu
Mar 31 09:41:24 2016
@@ -23,7 +23,7 @@ import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLParameters;
import javax.net.ssl.SSLServerSocket;
-class Jre8Compat extends Jre7Compat {
+class Jre8Compat extends JreCompat {
private static final Method getSSLParametersMethod;
private static final Method setUseCipherSuitesOrderMethod;
@@ -45,7 +45,7 @@ class Jre8Compat extends Jre7Compat {
} catch (NoSuchMethodException e) {
// Expected on Java < 8
} catch (ClassNotFoundException e) {
- // Expected on Java < 7
+ // Should never happen
}
getSSLParametersMethod = m1;
setUseCipherSuitesOrderMethod = m2;
Modified: tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java?rev=1737211&r1=1737210&r2=1737211&view=diff
==============================================================================
--- tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java
(original)
+++ tomcat/tc8.0.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java Thu
Mar 31 09:41:24 2016
@@ -16,8 +16,6 @@
*/
package org.apache.tomcat.util.compat;
-import java.util.Locale;
-
import javax.net.ssl.SSLEngine;
import javax.net.ssl.SSLServerSocket;
@@ -25,7 +23,7 @@ import org.apache.tomcat.util.res.String
/**
* This is the base implementation class for JRE compatibility and provides an
- * implementation based on Java 6. Sub-classes may extend this class and
provide
+ * implementation based on Java 7. Sub-classes may extend this class and
provide
* alternative implementations for later JRE versions
*/
public class JreCompat {
@@ -33,97 +31,42 @@ public class JreCompat {
private static final JreCompat instance;
private static StringManager sm =
StringManager.getManager(JreCompat.class.getPackage().getName());
- private static final boolean jre7Available;
private static final boolean jre8Available;
-
-
+
+
static {
- // This is Tomcat 7 with a minimum Java version of Java 6. The latest
+ // This is Tomcat 8 with a minimum Java version of Java 7. The latest
// Java version the optional features require is Java 8.
// Look for the highest supported JVM first
if (Jre8Compat.isSupported()) {
instance = new Jre8Compat();
- jre7Available = true;
jre8Available = true;
- } else if (Jre7Compat.isSupported()) {
- instance = new Jre7Compat();
- jre7Available = true;
- jre8Available = false;
} else {
instance = new JreCompat();
- jre7Available = false;
jre8Available = false;
}
}
-
-
+
+
public static JreCompat getInstance() {
return instance;
}
-
-
- // Java 6 implementation of Java 7 methods
-
- public static boolean isJre7Available() {
- return jre7Available;
- }
-
-
- public Locale forLanguageTag(String languageTag) {
- // Extract the language and country for this entry
- String language = null;
- String country = null;
- String variant = null;
- int dash = languageTag.indexOf('-');
- if (dash < 0) {
- language = languageTag;
- country = "";
- variant = "";
- } else {
- language = languageTag.substring(0, dash);
- country = languageTag.substring(dash + 1);
- int vDash = country.indexOf('-');
- if (vDash > 0) {
- String cTemp = country.substring(0, vDash);
- variant = country.substring(vDash + 1);
- country = cTemp;
- } else {
- variant = "";
- }
- }
- if (!isAlpha(language) || !isAlpha(country) || !isAlpha(variant)) {
- return null;
- }
- return new Locale(language, country, variant);
- }
-
-
- private static final boolean isAlpha(String value) {
- for (int i = 0; i < value.length(); i++) {
- char c = value.charAt(i);
- if (!((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'))) {
- return false;
- }
- }
- return true;
- }
-
-
- // Java 6 implementation of Java 8 methods
-
+
+ // Java 7 implementation of Java 8 methods
+
public static boolean isJre8Available() {
return jre8Available;
}
-
-
+
+
@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
