svn commit: r1505932 - /tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java

[kfujino]

Author: kfujino
Date: Tue Jul 23 08:37:54 2013
New Revision: 1505932

URL: http://svn.apache.org/r1505932
Log:
Avoid unnecessary redeployment of context descriptor.
Use a local variable instead of an instance variable.

Modified:
    tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java

Modified: tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java?rev=1505932&r1=1505931&r2=1505932&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java (original)
+++ tomcat/trunk/java/org/apache/catalina/startup/HostConfig.java Tue Jul 23 
08:37:54 2013
@@ -1082,6 +1082,7 @@ public class HostConfig
 
 
         DeployedApplication deployedApp;
+        boolean copyThisXml = copyXML;
 
         try {
             if (deployXML && xml.exists()) {
@@ -1100,7 +1101,6 @@ public class HostConfig
                     }
                 }
 
-                boolean copyThisXml = copyXML;
                 if (copyThisXml == false && context instanceof 
StandardContext) {
                     // Host is using default value. Context may override it.
                     copyThisXml = ((StandardContext) context).getCopyXML();
@@ -1159,7 +1159,7 @@ public class HostConfig
             deployedApp.redeployResources.put(dir.getAbsolutePath(),
                     Long.valueOf(dir.lastModified()));
             if (deployXML && xml.exists()) {
-                if (copyXML) {
+                if (copyThisXml) {
                     deployedApp.redeployResources.put(
                             xmlCopy.getAbsolutePath(),
                             Long.valueOf(xmlCopy.lastModified()));



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