fix Bug 57693
This commit is contained in:
parent
93b6e3174d
commit
231c99a5f0
@ -118,12 +118,13 @@ namespace ASC.Web.Files.Services.WCFService.FileOperations
|
||||
MimeMapping.GetMimeMapping(path),
|
||||
"attachment; filename=\"" + fileName + "\"");
|
||||
Result = string.Format("{0}?{1}=bulk&ext={2}", filesLinkUtility.FileHandlerPath, FilesLinkUtility.Action, archiveExtension);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
TaskInfo.SetProperty(FINISHED, true);
|
||||
FillDistributedTask();
|
||||
TaskInfo.PublishChanges();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
public override void PublishChanges(DistributedTask task)
|
||||
{
|
||||
var thirdpartyTask = ThirdPartyOperation.GetDistributedTask();
|
||||
@ -139,15 +140,7 @@ namespace ASC.Web.Files.Services.WCFService.FileOperations
|
||||
else if (!string.IsNullOrEmpty(error2))
|
||||
{
|
||||
Error = error2;
|
||||
}
|
||||
|
||||
var finished1 = thirdpartyTask.GetProperty<bool?>(FINISHED);
|
||||
var finished2 = daoTask.GetProperty<bool?>(FINISHED);
|
||||
|
||||
if (finished1 != null && finished2 != null)
|
||||
{
|
||||
TaskInfo.SetProperty(FINISHED, finished1);
|
||||
}
|
||||
}
|
||||
|
||||
successProcessed = thirdpartyTask.GetProperty<int>(PROCESSED) + daoTask.GetProperty<int>(PROCESSED);
|
||||
|
||||
@ -383,6 +376,7 @@ namespace ASC.Web.Files.Services.WCFService.FileOperations
|
||||
filesMessageService.Send(file, headers, MessageAction.FileDownloaded, file.Title);
|
||||
}
|
||||
}
|
||||
compressTo.CloseEntry();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
@ -393,8 +387,9 @@ namespace ASC.Web.Files.Services.WCFService.FileOperations
|
||||
else
|
||||
{
|
||||
compressTo.PutNextEntry();
|
||||
compressTo.CloseEntry();
|
||||
}
|
||||
compressTo.CloseEntry();
|
||||
|
||||
counter++;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user