tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject [tomcat] branch master updated: Re-word to aid back-ports
Date Tue, 01 Oct 2019 12:02:29 GMT
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
     new 35dc787  Re-word to aid back-ports
35dc787 is described below

commit 35dc787d477a4a7844a4ebd8d6e8608eba71211e
Author: Mark Thomas <markt@apache.org>
AuthorDate: Tue Oct 1 13:02:10 2019 +0100

    Re-word to aid back-ports
---
 java/org/apache/tomcat/util/compat/Jre9Compat.java         | 4 ++--
 java/org/apache/tomcat/util/compat/LocalStrings.properties | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/org/apache/tomcat/util/compat/Jre9Compat.java b/java/org/apache/tomcat/util/compat/Jre9Compat.java
index 8d8af88..730d107 100644
--- a/java/org/apache/tomcat/util/compat/Jre9Compat.java
+++ b/java/org/apache/tomcat/util/compat/Jre9Compat.java
@@ -103,8 +103,8 @@ class Jre9Compat extends JreCompat {
             o15 = majorMethod.invoke(o14);
 
         } catch (ClassNotFoundException e) {
-            // Must be Java 8
-            log.debug("jre9Compat.java8", e);
+            // Must be pre-Java 9
+            log.debug("jre9Compat.javaPre9", e);
         } catch (ReflectiveOperationException | IllegalArgumentException e) {
             // Should never happen
             log.error("jre9Compat.unexpected", e);
diff --git a/java/org/apache/tomcat/util/compat/LocalStrings.properties b/java/org/apache/tomcat/util/compat/LocalStrings.properties
index b385a35..891782c 100644
--- a/java/org/apache/tomcat/util/compat/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/compat/LocalStrings.properties
@@ -14,7 +14,7 @@
 # limitations under the License.
 
 jre9Compat.invalidModuleUri=The module URI provided [{0}] could not be converted to a URL
for the JarScanner to process
-jre9Compat.java8=Class not found so assuming code is running on Java 8
+jre9Compat.javaPre9=Class not found so assuming code is running on a pre-Java 9 JVM
 jre9Compat.unexpected=Failed to create references to Java 9 classes and methods
 
 jreCompat.noApplicationProtocol=Java Runtime does not support SSLEngine.getApplicationProtocol().
You must use Java 9 to use this feature.


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message