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.

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

Backport use of thread delay over sleep and handle dispose in FileSystemMainDomLock #18151

Conversation

AndyButland
Copy link
Contributor

Prerequisites

  • I have added steps to test this contribution in the description below

Description

This backports the changes applied in PRs #18119 and #18147.

Test steps are described in the second linked PR. I've verified these on this PR for Umbraco 13.

@nul800sebastiaan
Copy link
Member

@AndyButland I've marked the related PRs for release 13.7.0, which is where I think it will go?

@AndyButland
Copy link
Contributor Author

@JasonElkin - do you think you'd have time to look over this one please, just as a second pair of eyes that I've backported your amend to 13 correctly? Thanks if so.

Copy link
Contributor

@JasonElkin JasonElkin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

_lockFileStream?.Close();
_lockFileStream = null;

Should be replaced by a call to ReleaseLock()

@AndyButland AndyButland enabled auto-merge (squash) February 12, 2025 05:43
@AndyButland
Copy link
Contributor Author

Thanks @JasonElkin, have updated. I'll include this in the 13.7 release candidate due out today.

@AndyButland AndyButland dismissed JasonElkin’s stale review February 12, 2025 07:06

Have applied changes.

@AndyButland AndyButland disabled auto-merge February 12, 2025 07:06
@AndyButland AndyButland merged commit a282cc5 into v13/dev Feb 12, 2025
19 checks passed
@AndyButland AndyButland deleted the v13/task/handle-dispose-and-thread-delay-in-file-system-lock branch February 12, 2025 07:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants