lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 19:54:57 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

#20212: Fixing potential NREs in WrokflowManager

Browse Source 
Work Item: 20212
This commit is contained in:
Eric McGrath
2013-10-24 14:41:43 -07:00
committed by Sebastien Ros
parent c7d2593382
commit df60ed18f8
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Orchard.Web/Modules/Orchard.Workflows/Services/WorkflowManager.cs
View File

@@ -62,10 +62,11 @@ namespace Orchard.Workflows.Services {
// and any running workflow paused on this kind of activity for this content // and any running workflow paused on this kind of activity for this content
// it's important to return activities at this point as a workflow could be awaiting // it's important to return activities at this point as a workflow could be awaiting
// on several ones. When an activity is restarted, all the other ones of the same workflow are cancelled. // on several ones. When an activity is restarted, all the other ones of the same workflow are cancelled.
awaitingActivities.AddRange(_awaitingActivityRepository.Table.Where( var awaitingQuery = _awaitingActivityRepository.Table.Where(x => x.ActivityRecord.Name == name && x.ActivityRecord.Start == false);
x => x.ActivityRecord.Name == name && x.ActivityRecord.Start == false && (target.ContentItem == null || (x.WorkflowRecord.ContentItemRecord == target.ContentItem.Record)) awaitingQuery = target == null || target.ContentItem == null
).ToList() ? awaitingQuery.Where(x => x.WorkflowRecord.ContentItemRecord == null)
); : awaitingQuery.Where(x => x.WorkflowRecord.ContentItemRecord == target.ContentItem.Record);
awaitingActivities.AddRange(awaitingQuery.ToList());
// if no activity record is matching the event, do nothing // if no activity record is matching the event, do nothing
if (!startedWorkflows.Any() && !awaitingActivities.Any()) { if (!startedWorkflows.Any() && !awaitingActivities.Any()) {
@@ -116,7 +117,9 @@ namespace Orchard.Workflows.Services {
var workflowRecord = new WorkflowRecord { var workflowRecord = new WorkflowRecord {
WorkflowDefinitionRecord = activityRecord.WorkflowDefinitionRecord, WorkflowDefinitionRecord = activityRecord.WorkflowDefinitionRecord,
State = "{}", State = "{}",
ContentItemRecord = workflowContext.Content.ContentItem.Record ContentItemRecord = workflowContext.Content == null || workflowContext.Content.ContentItem == null
? null
: workflowContext.Content.ContentItem.Record
}; };
workflowContext.Record = workflowRecord; workflowContext.Record = workflowRecord;