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 HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

Browse Source 
51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Samuel Langlois
2013-08-20 17:17:31 +00:00
parent 0a36e2af67
commit ab4ca7177f
1576 changed files with 36419 additions and 8603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
View File

@@ -137,6 +137,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
private ContentDataDAO contentDataDAO;
private LocaleDAO localeDAO;
private UsageDAO usageDAO;
private NodeIndexer nodeIndexer;
private int cachingThreshold = 10;
@@ -1248,6 +1249,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
// Get the parent node
Node parentNode = getNodeNotNull(parentNodeId, true);
// Find an initial ACL for the node
Long parentAclId = parentNode.getAclId();
AccessControlListProperties inheritedAcl = null;
@@ -1913,13 +1915,6 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
// The node's version has moved on so no need to invalidate caches
}
// ALF-16366: Ensure index impact is accounted for. If the node is being deleted we would expect the
// appropriate events to be fired manually
if (!nodeUpdate.isUpdateTypeQNameId() || !getNodeNotNull(nodeId, false).getDeleted(qnameDAO))
{
nodeIndexer.indexUpdateNode(oldNode.getNodeRef());
}
// Done
if (isDebugEnabled)
{
@@ -1940,6 +1935,9 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
nodeUpdateEntity.setAclId(aclId);
nodeUpdateEntity.setUpdateAclId(true);
updateNodeImpl(oldNode, nodeUpdateEntity, null);
// Node must be indexed.
// Calls to this method are usually made directly
nodeIndexer.indexUpdateNode(oldNode.getNodeRef()); // Fix MNT-8485 and refix MNT-3337
}
public void setPrimaryChildrenSharedAclId(