inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-15 15:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.2.N (5.2.1) to HEAD (5.2)

Browse Source 
124480 aleahu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124472 dhulley: Formatting during investigations


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127756 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 16:03:47 +00:00
parent 28fcd6efb9
commit ba3c1bf61c
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -840,9 +840,9 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl implements Extens
@Extend(traitAPI=NodeServiceTrait.class,extensionAPI=NodeServiceExtension.class) @Extend(traitAPI=NodeServiceTrait.class,extensionAPI=NodeServiceExtension.class)
public int countChildAssocs(NodeRef nodeRef, boolean isPrimary) throws InvalidNodeRefException public int countChildAssocs(NodeRef nodeRef, boolean isPrimary) throws InvalidNodeRefException
{ {
final Pair<Long, NodeRef> nodePair = getNodePairNotNull(nodeRef); final Pair<Long, NodeRef> nodePair = getNodePairNotNull(nodeRef);
final Long nodeId = nodePair.getFirst(); final Long nodeId = nodePair.getFirst();
return nodeDAO.countChildAssocsByParent(nodeId, isPrimary); return nodeDAO.countChildAssocsByParent(nodeId, isPrimary);
} }
@Override @Override
@@ -911,7 +911,7 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl implements Extens
{ {
logger.trace( logger.trace(
"Aspect-triggered association removal: " + "Aspect-triggered association removal: " +
"Ignoring child associations where one of the nodes is pending delete: " + childAssocPair); "Ignoring child associations where one of the nodes is pending delete: " + childAssocPair);
} }
return true; return true;
} }
@@ -1971,10 +1971,10 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl implements Extens
@Extend(traitAPI=NodeServiceTrait.class,extensionAPI=NodeServiceExtension.class) @Extend(traitAPI=NodeServiceTrait.class,extensionAPI=NodeServiceExtension.class)
public NodeRef getChildByName(NodeRef nodeRef, QName assocTypeQName, String childName) public NodeRef getChildByName(NodeRef nodeRef, QName assocTypeQName, String childName)
{ {
ParameterCheck.mandatory("childName", childName); ParameterCheck.mandatory("childName", childName);
ParameterCheck.mandatory("nodeRef", nodeRef); ParameterCheck.mandatory("nodeRef", nodeRef);
ParameterCheck.mandatory("assocTypeQName", assocTypeQName); ParameterCheck.mandatory("assocTypeQName", assocTypeQName);
// Get the node // Get the node
Pair<Long, NodeRef> nodePair = getNodePairNotNull(nodeRef); Pair<Long, NodeRef> nodePair = getNodePairNotNull(nodeRef);
Long nodeId = nodePair.getFirst(); Long nodeId = nodePair.getFirst();