From 42a008b65a2d354776a2fd34d6a62c9703162065 Mon Sep 17 00:00:00 2001 From: "CORP\\mmrzik" Date: Mon, 13 Nov 2023 16:34:07 +0100 Subject: [PATCH] #13: fix merge error and bug in Aws.moveAndProcessExtraction --- cli/src/main/java/com/devonfw/tools/ide/io/FileAccessImpl.java | 3 --- cli/src/main/java/com/devonfw/tools/ide/tool/aws/Aws.java | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/cli/src/main/java/com/devonfw/tools/ide/io/FileAccessImpl.java b/cli/src/main/java/com/devonfw/tools/ide/io/FileAccessImpl.java index 75fe33d7a..87e527fb8 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/io/FileAccessImpl.java +++ b/cli/src/main/java/com/devonfw/tools/ide/io/FileAccessImpl.java @@ -448,9 +448,6 @@ public void delete(Path path) { } else { deleteRecursive(path); } - else { - deleteRecursive(path); - } } catch (IOException e) { throw new IllegalStateException("Failed to delete " + path, e); } diff --git a/cli/src/main/java/com/devonfw/tools/ide/tool/aws/Aws.java b/cli/src/main/java/com/devonfw/tools/ide/tool/aws/Aws.java index 85149a624..525277606 100644 --- a/cli/src/main/java/com/devonfw/tools/ide/tool/aws/Aws.java +++ b/cli/src/main/java/com/devonfw/tools/ide/tool/aws/Aws.java @@ -46,7 +46,7 @@ private void makeExecutable(Path file) { } @Override - protected void moveAndProcessExtraction(Path to, Path from) { + protected void moveAndProcessExtraction(Path from, Path to) { if (!this.context.getSystemInfo().isLinux()) { this.context.getFileAccess().move(from, to);