Throw failure when file already exists.

iterate-ch · May 3, 2024 · 9f22daf · 9f22daf
1 parent fc2b4f7
commit 9f22daf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/core/src/main/java/ch/cyberduck/core/local/DefaultLocalTouchFeature.java b/core/src/main/java/ch/cyberduck/core/local/DefaultLocalTouchFeature.java
@@ -52,11 +52,8 @@ public void touch(final Local file) throws AccessDeniedException {
             }
             catch(FileAlreadyExistsException e) {
                 log.warn(String.format("File %s already exists", file));
-                if(Files.isDirectory(Paths.get(file.getAbsolute()))) {
-                    throw new LocalAccessDeniedException(MessageFormat.format(
+                throw new LocalAccessDeniedException(MessageFormat.format(
                         LocaleFactory.localizedString("Cannot create {0}", "Error"), file.getAbsolute()), e);
-                }
-                return;
             }
         }
         catch(IOException e) {

diff --git a/core/src/test/java/ch/cyberduck/core/local/DefaultLocalTouchFeatureTest.java b/core/src/test/java/ch/cyberduck/core/local/DefaultLocalTouchFeatureTest.java
@@ -10,8 +10,7 @@
 
 import java.util.UUID;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 public class DefaultLocalTouchFeatureTest {
 
@@ -24,10 +23,7 @@ public void testTouch() throws Exception {
         f.touch(l);
         assertTrue(parent.exists());
         assertTrue(l.exists());
-        f.touch(l);
-        assertTrue(l.exists());
-        // Test fail silently
-        f.touch(l);
+        assertThrows(LocalAccessDeniedException.class, () -> f.touch(l));
         l.delete();
         parent.delete();
     }

diff --git a/core/src/test/java/ch/cyberduck/core/local/LocalTest.java b/core/src/test/java/ch/cyberduck/core/local/LocalTest.java
@@ -226,6 +226,8 @@ public void testOpenInputStream() throws Exception {
     public void testOpenOutputStream() throws Exception {
         Local l = new TestLocal(String.format("%s/%s", System.getProperty("java.io.tmpdir"), new AlphanumericRandomStringService().random()));
         assertNotNull(l.getOutputStream(false));
+        assertThrows(LocalAccessDeniedException.class, () -> new DefaultLocalTouchFeature().touch(l));
+        l.delete();
         new DefaultLocalTouchFeature().touch(l);
         assertNotNull(l.getOutputStream(false));
         assertNotNull(l.getOutputStream(true));