[tomcat-jakartaee-migration] branch master updated: Improve tests results

[remm]

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-jakartaee-migration.git


The following commit(s) were added to refs/heads/master by this push:
     new 5bf42bb  Improve tests results
5bf42bb is described below

commit 5bf42bb3139f82e61b5098344e997e339ef14644
Author: remm <r...@apache.org>
AuthorDate: Tue Sep 22 09:30:26 2020 +0200

    Improve tests results
    
    migrateFile just ignores if the destination exists, so migrateDirectory
    could do that as well.
---
 src/main/java/org/apache/tomcat/jakartaee/Migration.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/apache/tomcat/jakartaee/Migration.java 
b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
index b297747..69a23c0 100644
--- a/src/main/java/org/apache/tomcat/jakartaee/Migration.java
+++ b/src/main/java/org/apache/tomcat/jakartaee/Migration.java
@@ -99,7 +99,7 @@ public class Migration {
         boolean result = true;
         long t1 = System.nanoTime();
         if (source.isDirectory()) {
-            if (destination.mkdirs()) {
+            if ((destination.exists() && destination.isDirectory()) || 
destination.mkdirs()) {
                 result = result && migrateDirectory(source, destination);
             } else {
                 logger.log(Level.WARNING, sm.getString("migration.mkdirError", 
destination.getAbsolutePath()));
@@ -129,7 +129,7 @@ public class Migration {
             File srcFile = new File(src, file);
             File destFile = new File(dest, file);
             if (srcFile.isDirectory()) {
-                if (destFile.mkdir()) {
+                if ((destFile.exists() && destFile.isDirectory()) || 
destFile.mkdir()) {
                     result = result && migrateDirectory(srcFile, destFile);
                 } else {
                     logger.log(Level.WARNING, 
sm.getString("migration.mkdirError", destFile.getAbsolutePath()));


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