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

Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
64835: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (4.3/Cloud)
      64763: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.2)
         64693: Merged V4.1.8 (4.1.8) to V4.1-BUG-FIX (4.1.9)
            64175: Merged DEV to 4.1.8
               64114: MNT-10796: Incorrect search result when content is deleted.
                 - DBNodeServiceImpl#deleteNode() was updated that will delete a node entry from an index. Requires retest of MNT-3337 and MNT-8485.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@66196 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-04-02 20:02:30 +00:00
parent 267fffbe37
commit dd247ae264
3 changed files with 57 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1937,9 +1937,6 @@ 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(

2
source/java/org/alfresco/repo/node/db/DbNodeServiceImpl.java
View File

@@ -1268,7 +1268,7 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl
invokeOnDeleteNode(
nodeToDelete.primaryParentAssocPair.getSecond(),
childNodeTypeQName, childAspectQnames, archive);
nodeIndexer.indexDeleteNode(childAssocRef);
nodeIndexer.indexDeleteNode(nodeToDelete.primaryParentAssocPair.getSecond());
}
// Clear out the list of nodes pending delete