Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revised fix 78302f83 because of regression caused by f4466fcb. #16285

Merged
merged 1 commit into from
Sep 4, 2024
+6 −1
Merged

Revised fix 78302f83 because of regression caused by f4466fcb. #16285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion osx/src/main/java/ch/cyberduck/ui/cocoa/controller/InfoController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -1970,7 +1971,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
}
Expand Down
4 changes: 4 additions & 0 deletions windows/src/main/csharp/ch/cyberduck/ui/controller/InfoController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down