lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-04-05 21:01:35 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fixed removal of records in DistributedLockService

Browse Source 
Fixes #6444
This commit is contained in:
Sipke Schoorstra 2016-04-12 01:10:00 +02:00 committed by Sébastien Ros
parent a5605b7fbd
commit 660f41c582
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Orchard/Tasks/Locking/Services/DistributedLockService.cs
View File

@ -89,7 +89,7 @@ namespace Orchard.Tasks.Locking.Services {
DistributedLock dLock = null; DistributedLock dLock = null;
// If there's already a distributed lock object in our dictionary, that means // If there's already a distributed lock object in our dictionary, that means
// this acquisition is a reentrance. Use the existing lock object from the // this acquisition is a reentrance. Use the existing lock object from the
// dictionary but increment its count. // dictionary but increment its count.
if (_locks.TryGetValue(monitorObj, out dLock)) { if (_locks.TryGetValue(monitorObj, out dLock)) {
Logger.Debug("Current thread is re-entering lock '{0}'; incrementing count.", internalName); Logger.Debug("Current thread is re-entering lock '{0}'; incrementing count.", internalName);
@ -141,9 +141,18 @@ namespace Orchard.Tasks.Locking.Services {
ExecuteOnSeparateTransaction(repository => { ExecuteOnSeparateTransaction(repository => {
// Try to find a valid lock record in the database. // Try to find a valid lock record in the database.
var record = repository.Table.FirstOrDefault(x => x.Name == internalName && (x.ValidUntilUtc == null || x.ValidUntilUtc >= _clock.UtcNow)); var records = repository.Table.Where(x => x.Name == internalName).ToList();
var record = records.FirstOrDefault(x => x.ValidUntilUtc == null || x.ValidUntilUtc >= _clock.UtcNow);
if (record == null) { if (record == null) {
// No record existed, so we're good to create a new one.
// No record matched the criteria, but at least one expired record with the specified name was found.
// Delete the expired records before creating a new one. In theory no more than one record can exist
// due to the unique key constraint on the 'Name' column, it won't hurt to work on a collection.
foreach (var expiredRecord in records) {
repository.Delete(expiredRecord);
}
// No valid record existed, so we're good to create a new one.
Logger.Debug("No valid record was found for lock '{0}'; creating a new record.", internalName); Logger.Debug("No valid record was found for lock '{0}'; creating a new record.", internalName);
repository.Create(new DistributedLockRecord { repository.Create(new DistributedLockRecord {