[tomcat] branch 8.5.x updated: Avoid getting the boot classpath when it is not available

[remm]

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

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


The following commit(s) were added to refs/heads/8.5.x by this push:
     new 2b5a913  Avoid getting the boot classpath when it is not available
2b5a913 is described below

commit 2b5a913980b536dcc4027a215d1d7f1a1c83754e
Author: remm <r...@apache.org>
AuthorDate: Mon Apr 26 12:12:40 2021 +0200

    Avoid getting the boot classpath when it is not available
    
    BZ 65265, results in an unsupported operation exception.
---
 java/org/apache/tomcat/util/Diagnostics.java | 4 +++-
 webapps/docs/changelog.xml                   | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/java/org/apache/tomcat/util/Diagnostics.java 
b/java/org/apache/tomcat/util/Diagnostics.java
index 788778c..aa07d6a 100644
--- a/java/org/apache/tomcat/util/Diagnostics.java
+++ b/java/org/apache/tomcat/util/Diagnostics.java
@@ -559,7 +559,9 @@ public class Diagnostics {
 
         sb.append(requestedSm.getString("diagnostics.vmInfoPath"));
         sb.append(":" + CRLF);
-        sb.append(INDENT1 + "bootClassPath: " + 
runtimeMXBean.getBootClassPath() + CRLF);
+        if (runtimeMXBean.isBootClassPathSupported()) {
+            sb.append(INDENT1 + "bootClassPath: " + 
runtimeMXBean.getBootClassPath() + CRLF);
+        }
         sb.append(INDENT1 + "classPath: " + runtimeMXBean.getClassPath() + 
CRLF);
         sb.append(INDENT1 + "libraryPath: " + runtimeMXBean.getLibraryPath() + 
CRLF);
         sb.append(CRLF);
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 1f05fb7..31d840b 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -154,6 +154,10 @@
         <bug>65235</bug>: Correct name of <code>changeLocalName</code> in the
         documentation for the <code>RemoteIpValve</code>. (markt)
       </fix>
+      <fix>
+        <bug>65265</bug>: Avoid getting the boot classpath when it is not
+        available in the Manager diagnostics. (remm)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Other">

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