(tomcat) branch main updated: Add constant

[remm]

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

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


The following commit(s) were added to refs/heads/main by this push:
     new 86bd1a42b1 Add constant
86bd1a42b1 is described below

commit 86bd1a42b15e186db4cdfa676f4e8652cba59490
Author: remm <r...@apache.org>
AuthorDate: Mon Apr 22 16:48:52 2024 +0200

    Add constant
    
    For better readability, after reviewing the ConfigurationSource code.
---
 .../apache/catalina/startup/CatalinaBaseConfigurationSource.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git 
a/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java 
b/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java
index cedc1cdd23..cd31f0fd1e 100644
--- a/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java
+++ b/java/org/apache/catalina/startup/CatalinaBaseConfigurationSource.java
@@ -33,6 +33,8 @@ public class CatalinaBaseConfigurationSource implements 
ConfigurationSource {
 
     protected static final StringManager sm = 
StringManager.getManager(Constants.Package);
 
+    public static final String LEGACY_SERVER_EMBED_XML = "server-embed.xml";
+
     private final String serverXmlPath;
     private final File catalinaBaseFile;
     private final URI catalinaBaseUri;
@@ -58,10 +60,10 @@ public class CatalinaBaseConfigurationSource implements 
ConfigurationSource {
         }
         if (result == null) {
             // Compatibility with legacy server-embed.xml location
-            InputStream stream = 
getClass().getClassLoader().getResourceAsStream("server-embed.xml");
+            InputStream stream = 
getClass().getClassLoader().getResourceAsStream(LEGACY_SERVER_EMBED_XML);
             if (stream != null) {
                 try {
-                    result = new Resource(stream, 
getClass().getClassLoader().getResource("server-embed.xml").toURI());
+                    result = new Resource(stream, 
getClass().getClassLoader().getResource(LEGACY_SERVER_EMBED_XML).toURI());
                 } catch (URISyntaxException e) {
                     stream.close();
                 }


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