Author: markt
Date: Mon Oct 16 19:55:02 2017
New Revision: 1812319
URL: http://svn.apache.org/viewvc?rev=1812319&view=rev
Log:
Correct the return value for jarFileRuntimeMajorVersion although the incorrect
value shouldn't cause any problems for the multi-release JAR support that uses
this code.
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=1812319&r1=1812318&r2=1812319&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
Oct 16 19:55:02 2017
@@ -24,6 +24,8 @@ import javax.net.ssl.SSLParameters;
class Jre8Compat extends JreCompat {
+ private static final int RUNTIME_MAJOR_VERSION = 8;
+
private static final Method setUseCipherSuitesOrderMethod;
@@ -66,4 +68,10 @@ class Jre8Compat extends JreCompat {
throw new UnsupportedOperationException(e);
}
}
+
+
+ @Override
+ public int jarFileRuntimeMajorVersion() {
+ return RUNTIME_MAJOR_VERSION;
+ }
}
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=1812319&r1=1812318&r2=1812319&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
Oct 16 19:55:02 2017
@@ -35,7 +35,7 @@ import org.apache.tomcat.util.res.String
*/
public class JreCompat {
- private static final int RUNTIME_MAJOR_VERSION = 8;
+ private static final int RUNTIME_MAJOR_VERSION = 7;
private static final JreCompat instance;
private static StringManager sm =
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
