[tomcat] branch master updated: Simplify and add a string

[Rémy Maucherat]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 06ed401  Simplify and add a string
06ed401 is described below

commit 06ed401eefbed833e862c64ce203b67e5d7bc1be
Author: remm <[hidden email]>
AuthorDate: Fri Feb 19 15:50:30 2021 +0100

    Simplify and add a string
---
 java/org/apache/catalina/startup/HostConfig.java         | 4 ++--
 java/org/apache/catalina/startup/LocalStrings.properties | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/java/org/apache/catalina/startup/HostConfig.java b/java/org/apache/catalina/startup/HostConfig.java
index 4cc8b5e..6f332b2 100644
--- a/java/org/apache/catalina/startup/HostConfig.java
+++ b/java/org/apache/catalina/startup/HostConfig.java
@@ -1282,7 +1282,7 @@ public class HostConfig implements LifecycleListener {
             tempNew = File.createTempFile("new", null, host.getLegacyAppBaseFile());
             tempOld = File.createTempFile("old", null, host.getLegacyAppBaseFile());
             // createTempFile is not directly compatible with directories, so cleanup
-            ExpandWar.delete(tempNew);
+            tempNew.delete();
 
             // The use of defaults is deliberate here to avoid having to
             // recreate every configuration option on the host. Better to change
@@ -1301,7 +1301,7 @@ public class HostConfig implements LifecycleListener {
 
         } catch (Throwable t) {
             ExceptionUtils.handleThrowable(t);
-            log.warn("Migration failure", t);
+            log.warn(sm.getString("hostConfig.migrateError"), t);
         } finally {
             if (tempNew != null && tempNew.exists()) {
                 ExpandWar.delete(tempNew);
diff --git a/java/org/apache/catalina/startup/LocalStrings.properties b/java/org/apache/catalina/startup/LocalStrings.properties
index e31a53f..b8d0aff 100644
--- a/java/org/apache/catalina/startup/LocalStrings.properties
+++ b/java/org/apache/catalina/startup/LocalStrings.properties
@@ -137,6 +137,7 @@ hostConfig.illegalWarName=The war name [{0}] is invalid. The archive will be ign
 hostConfig.jmx.register=Register context [{0}] failed
 hostConfig.jmx.unregister=Unregister context [{0}] failed
 hostConfig.migrateApp.threaded.error=Error waiting for multi-thread migration of legacy applications to complete
+hostConfig.migrateError=Migration failure
 hostConfig.reload=Reloading context [{0}]
 hostConfig.resourceNotAbsolute=Unable to remove resource from context [{0}] since [{1}] is not an absolute path
 hostConfig.start=HostConfig: Processing START


---------------------------------------------------------------------
To unsubscribe, e-mail: [hidden email]
For additional commands, e-mail: [hidden email]