Author: markt
Date: Fri Sep 4 08:20:01 2015
New Revision: 1701170
URL: http://svn.apache.org/r1701170
Log:
Add method to determine if JRE 7 features are available. (Prep for
https://bz.apache.org/bugzilla/show_bug.cgi?id=57681)
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java
Modified: tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java?rev=1701170&r1=1701169&r2=1701170&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/compat/JreCompat.java Fri
Sep 4 08:20:01 2015
@@ -33,6 +33,7 @@ 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;
@@ -42,12 +43,15 @@ public class JreCompat {
// 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;
}
}
@@ -58,7 +62,12 @@ public class JreCompat {
}
- // Java 7 methods
+ // 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
@@ -101,7 +110,7 @@ public class JreCompat {
}
- // Java 8 methods
+ // Java 6 implementation of Java 8 methods
public static boolean isJre8Available() {
return jre8Available;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
