Author: markt
Date: Mon Dec 3 17:31:42 2018
New Revision: 1848071
URL: http://svn.apache.org/viewvc?rev=1848071&view=rev
Log:
Rename for clarity
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
Modified: tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java?rev=1848071&r1=1848070&r2=1848071&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Tomcat.java Mon Dec 3
17:31:42 2018
@@ -1295,7 +1295,7 @@ public class Tomcat {
if (docBase.isDirectory()) {
return getWebappConfigFileFromDirectory(docBase, contextName);
} else {
- return getWebappConfigFileFromJar(docBase, contextName);
+ return getWebappConfigFileFromWar(docBase, contextName);
}
}
@@ -1313,7 +1313,7 @@ public class Tomcat {
return result;
}
- private URL getWebappConfigFileFromJar(File docBase, String contextName) {
+ private URL getWebappConfigFileFromWar(File docBase, String contextName) {
URL result = null;
try (JarFile jar = new JarFile(docBase)) {
JarEntry entry = jar.getJarEntry(Constants.ApplicationContextXml);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
