Skip to content

Lock appropriate tree for media operations#19422

Merged
AndyButland merged 1 commit intoumbraco:v13/mainfrom
rbottema:patch-1
May 27, 2025
Merged

Lock appropriate tree for media operations#19422
AndyButland merged 1 commit intoumbraco:v13/mainfrom
rbottema:patch-1

Conversation

@rbottema
Copy link
Contributor

The MediaService currently locks the ContentTree for GetPagedOfType(s) operations, but it's querying the MediaTree. This ensures we lock the correct tree.

The MediaService currently locks the ContentTree for GetPagedOfType(s) operations, but it's querying the MediaTree. This ensures we lock the correct tree.
Copilot AI review requested due to automatic review settings May 26, 2025 13:44
@github-actions
Copy link

Hi there @rbottema, thank you for this contribution! 👍

While we wait for one of the Core Collaborators team to have a look at your work, we wanted to let you know about that we have a checklist for some of the things we will consider during review:

  • It's clear what problem this is solving, there's a connected issue or a description of what the changes do and how to test them
  • The automated tests all pass (see "Checks" tab on this PR)
  • The level of security for this contribution is the same or improved
  • The level of performance for this contribution is the same or improved
  • Avoids creating breaking changes; note that behavioral changes might also be perceived as breaking
  • If this is a new feature, Umbraco HQ provided guidance on the implementation beforehand
  • 💡 The contribution looks original and the contributor is presumably allowed to share it

Don't worry if you got something wrong. We like to think of a pull request as the start of a conversation, we're happy to provide guidance on improving your contribution.

If you realize that you might want to make some changes then you can do that by adding new commits to the branch you created for this work and pushing new commits. They should then automatically show up as updates to this pull request.

Thanks, from your friendly Umbraco GitHub bot 🤖 🙂

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull Request Overview

Fixes the lock used for media queries to ensure the MediaTree is locked rather than the ContentTree.

  • Updated the read lock in GetPagedOfType to use MediaTree
  • Updated the read lock in GetPagedOfTypes to use MediaTree
Comments suppressed due to low confidence (2)

src/Umbraco.Core/Services/MediaService.cs:421

  • Consider adding a unit or integration test to verify that GetPagedOfType acquires the MediaTree lock as intended, preventing regressions in the locking behavior.
scope.ReadLock(Constants.Locks.MediaTree);

src/Umbraco.Core/Services/MediaService.cs:444

  • Consider adding a unit or integration test to verify that GetPagedOfTypes acquires the MediaTree lock as intended, preventing regressions in the locking behavior.
scope.ReadLock(Constants.Locks.MediaTree);

Copy link
Contributor

@AndyButland AndyButland left a comment

Choose a reason for hiding this comment

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

Thanks @rbottema - looks a clear and obvious fix, will include for 13.10.

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.

2 participants