mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V2.2 to HEAD
8357: Fixed code that would break in UI cluster. 8402: Fix for AWC-1915 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8512 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -475,7 +475,6 @@ public class SubmitDialog extends BaseDialogBean
|
||||
final String sandboxPath = AVMUtil.buildSandboxRootPath(this.avmBrowseBean.getSandbox());
|
||||
final String stagingPath = AVMUtil.buildSandboxRootPath(this.avmBrowseBean.getStagingStore());
|
||||
final List<AVMDifference> diffs = new ArrayList<AVMDifference>(items.size());
|
||||
final AVMSyncService syncService = this.getAvmSyncService();
|
||||
final String submitLabel = this.label;
|
||||
final String submitComment = this.comment;
|
||||
|
||||
@@ -511,7 +510,7 @@ public class SubmitDialog extends BaseDialogBean
|
||||
{
|
||||
public Object doWork() throws Exception
|
||||
{
|
||||
syncService.update(diffs, null, true, true, false, false, submitLabel, submitComment);
|
||||
getAvmSyncService().update(diffs, null, true, true, false, false, submitLabel, submitComment);
|
||||
AVMDAOs.Instance().fAVMNodeDAO.flush();
|
||||
getAvmSyncService().flatten(sandboxPath, stagingPath);
|
||||
return null;
|
||||
|
Reference in New Issue
Block a user