Author: remm
Date: Wed Jan 24 15:13:11 2018
New Revision: 1822109
URL: http://svn.apache.org/viewvc?rev=1822109&view=rev
Log:
Avoid duplicate load calls (which can happen in some cases like a malformed
server.xml).
Modified:
tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=1822109&r1=1822108&r2=1822109&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Wed Jan 24
15:13:11 2018
@@ -122,6 +122,12 @@ public class Catalina {
protected boolean useNaming = true;
+ /**
+ * Prevent duplicate loads.
+ */
+ protected boolean loaded = false;
+
+
// ----------------------------------------------------------- Constructors
public Catalina() {
@@ -518,6 +524,11 @@ public class Catalina {
*/
public void load() {
+ if (loaded) {
+ return;
+ }
+ loaded = true;
+
long t1 = System.nanoTime();
initDirs();
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1822109&r1=1822108&r2=1822109&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Jan 24 15:13:11 2018
@@ -51,6 +51,9 @@
Prevent a stack trace being written to standard out when running on
Java
10 due to changes in the <code>LogManager</code> implementation.
(markt)
</fix>
+ <fix>
+ Avoid duplicate load attempts if one has been made already. (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
