Merged 5.1.N (5.1.1) to HEAD (5.1)

120105 nsmintanca: Merged 5.0.N (5.0.4) to 5.1.N (5.1.1)
      120045 gjames: Merged MNT-15211 (5.0.4) to 5.0.N (5.0.4)
         119806 gjames: MNT-15211 Re-enabled the non-auditable test, and corrected the createnode.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@123612 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-03-11 21:34:41 +00:00
parent 4a5059192b
commit e39037672c
2 changed files with 2 additions and 2 deletions

View File

@@ -1292,7 +1292,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
// Create the node (it is not a root node)
Long nodeTypeQNameId = qnameDAO.getOrCreateQName(nodeTypeQName).getFirst();
Long nodeLocaleId = localeDAO.getOrCreateLocalePair(nodeLocale).getFirst();
NodeEntity node = newNodeImpl(store, uuid, nodeTypeQNameId, nodeLocaleId, childAclId, auditableProps, false);
NodeEntity node = newNodeImpl(store, uuid, nodeTypeQNameId, nodeLocaleId, childAclId, auditableProps, true);
Long nodeId = node.getId();
// Protect the node's cm:auditable if it was explicitly set