Merge pull request #16285 from iterate-ch/bugfix/GH-10789

Revised fix 78302f8 because of regression caused by f4466fc.
iterate-ch · Sep 4, 2024 · 1d010a4 · 1d010a4
2 parents dcdc08c + f2a3475
commit 1d010a4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/InfoController.java b/osx/src/main/java/ch/cyberduck/ui/cocoa/controller/InfoController.java
@@ -39,6 +39,7 @@
 import ch.cyberduck.core.cdn.features.Purge;
 import ch.cyberduck.core.date.RFC1123DateFormatter;
 import ch.cyberduck.core.exception.BackgroundException;
+import ch.cyberduck.core.exception.ConflictException;
 import ch.cyberduck.core.exception.InteroperabilityException;
 import ch.cyberduck.core.features.AclPermission;
 import ch.cyberduck.core.features.Delete;
@@ -1969,7 +1970,7 @@ public Void run(final Session<?> session) throws BackgroundException {
                         try {
                             transferAcceleration = session.getFeature(TransferAcceleration.class).getStatus(file);
                         }
-                        catch(InteroperabilityException e) {
+                        catch(InteroperabilityException | ConflictException e) {
                             log.warn(String.format("Ignore failure %s reading transfer acceleration", e));
                             // 405 The specified method is not allowed against this resource
                         }

diff --git a/windows/src/main/csharp/ch/cyberduck/ui/controller/InfoController.cs b/windows/src/main/csharp/ch/cyberduck/ui/controller/InfoController.cs
@@ -1452,6 +1452,10 @@ public override object run(Session session)
                     {
                         Log.warn("Ignore failure reading transfer acceleration", ex);
                     }
+                    catch (ConflictException ex)
+                    {
+                        Log.warn("Ignore failure reading transfer acceleration", ex);
+                    }
                 }
                 return true;
             }