inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V2.1 to HEAD

Browse Source 
6944: More hibernate session cache taming.
   6945: Times for commits are close to linear in the number of items submitted.
   6946: Missing break statement. (Courtesy of Jan).
   6948: Fixed session cache eviction problem triggered by resetLayer().
   6956: Wrapped AVMService and AttributeService in TransactionResourceInterceptor.
   Reverted log4j.properties


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@7368 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2007-11-12 23:18:09 +00:00
parent f261c168b7
commit 127d0b34fe
1 changed files with 140 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/java/org/alfresco/web/bean/wcm/SubmitDialog.java
View File

@@ -407,7 +407,6 @@ public class SubmitDialog extends BaseDialogBean
String sandboxPath = AVMUtil.buildSandboxRootPath(this.avmBrowseBean.getSandbox()); String sandboxPath = AVMUtil.buildSandboxRootPath(this.avmBrowseBean.getSandbox());
String stagingPath = AVMUtil.buildSandboxRootPath(this.avmBrowseBean.getStagingStore()); String stagingPath = AVMUtil.buildSandboxRootPath(this.avmBrowseBean.getStagingStore());
List<AVMDifference> diffs = new ArrayList<AVMDifference>(items.size()); List<AVMDifference> diffs = new ArrayList<AVMDifference>(items.size());
String storeId = this.avmBrowseBean.getWebProject().getStoreId(); String storeId = this.avmBrowseBean.getWebProject().getStoreId();
for (ItemWrapper wrapper : items) for (ItemWrapper wrapper : items)
{ {
@@ -431,12 +430,10 @@ public class SubmitDialog extends BaseDialogBean
this.virtUpdatePath = destPath; this.virtUpdatePath = destPath;
} }
} }
// write changes to layer so files are marked as modified // write changes to layer so files are marked as modified
this.avmSyncService.update(diffs, null, true, true, false, false, this.label, this.comment); this.avmSyncService.update(diffs, null, true, true, false, false, this.label, this.comment);
AVMDAOs.Instance().fAVMNodeDAO.flush(); AVMDAOs.Instance().fAVMNodeDAO.flush();
avmSyncService.flatten(sandboxPath, stagingPath); avmSyncService.flatten(sandboxPath, stagingPath);
// if we get this far return the default outcome // if we get this far return the default outcome
return this.getDefaultFinishOutcome(); return this.getDefaultFinishOutcome();
} }