This is an automated email from the ASF dual-hosted git repository.

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

commit 17cd18f62d30dda534fa5563db3eeba1a8a79874
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Oct 1 12:54:00 2019 +0100

    Add logging
---
 java/org/apache/tomcat/util/compat/Jre9Compat.java         | 8 +++++++-
 java/org/apache/tomcat/util/compat/LocalStrings.properties | 2 ++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/compat/Jre9Compat.java 
b/java/org/apache/tomcat/util/compat/Jre9Compat.java
index dcfdbcd..73b2fe0 100644
--- a/java/org/apache/tomcat/util/compat/Jre9Compat.java
+++ b/java/org/apache/tomcat/util/compat/Jre9Compat.java
@@ -95,16 +95,22 @@ class Jre9Compat extends Jre8Compat {
 
         } catch (SecurityException e) {
             // Should never happen
+            log.error(sm.getString("jre9Compat.unexpected"), e);
         } catch (NoSuchMethodException e) {
             // Should never happen
+            log.error(sm.getString("jre9Compat.unexpected"), e);
         } catch (ClassNotFoundException e) {
-            // Must be Java 8
+            // Must be pre-Java 9
+            log.debug(sm.getString("jre9Compat.javaPre9"), e);
         } catch (IllegalArgumentException e) {
             // Should never happen
+            log.error(sm.getString("jre9Compat.unexpected"), e);
         } catch (IllegalAccessException e) {
             // Should never happen
+            log.error(sm.getString("jre9Compat.unexpected"), e);
         } catch (InvocationTargetException e) {
             // Should never happen
+            log.error(sm.getString("jre9Compat.unexpected"), e);
         }
 
         inaccessibleObjectExceptionClazz = c1;
diff --git a/java/org/apache/tomcat/util/compat/LocalStrings.properties 
b/java/org/apache/tomcat/util/compat/LocalStrings.properties
index 323087c..658bb43 100644
--- a/java/org/apache/tomcat/util/compat/LocalStrings.properties
+++ b/java/org/apache/tomcat/util/compat/LocalStrings.properties
@@ -14,6 +14,8 @@
 # limitations under the License.
 
 jre9Compat.invalidModuleUri=The module URI provided [{0}] could not be 
converted to a URL for the JarScanner to process
+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.noFlushableGzipOutputStream=Java Runtime does not support flushable 
GZIP output streams. You must use Java 7 or later to use this feature.
 jreCompat.noServerCipherSuiteOrder=Java Runtime does not support 
"useServerCipherSuitesOrder". You must use Java 8 or later to use this feature.


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

Reply via email to