mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Fixed ALF-10280: Slow to report « Duplicate entry » in database.
- DuplicateChildNodeNameException implements DoNotRetryException - Must be merged back to V3.4 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30468 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -20,6 +20,7 @@ package org.alfresco.repo.node;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Collections;
|
||||
import java.util.HashMap;
|
||||
import java.util.Locale;
|
||||
import java.util.Map;
|
||||
|
||||
@@ -30,6 +31,7 @@ import org.alfresco.repo.security.authentication.AuthenticationUtil;
|
||||
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
|
||||
import org.alfresco.service.ServiceRegistry;
|
||||
import org.alfresco.service.cmr.repository.AssociationRef;
|
||||
import org.alfresco.service.cmr.repository.DuplicateChildNodeNameException;
|
||||
import org.alfresco.service.cmr.repository.MLText;
|
||||
import org.alfresco.service.cmr.repository.NodeRef;
|
||||
import org.alfresco.service.cmr.repository.NodeRef.Status;
|
||||
@@ -211,11 +213,14 @@ public class NodeServiceTest extends TestCase
|
||||
ContentModel.TYPE_FOLDER).getChildRef();
|
||||
for (int i = 1; i < liveNodeRefs.length; i++)
|
||||
{
|
||||
Map<QName, Serializable> props = new HashMap<QName, Serializable>(3);
|
||||
props.put(ContentModel.PROP_NAME, "depth-" + i);
|
||||
liveNodeRefs[i] = nodeService.createNode(
|
||||
liveNodeRefs[i-1],
|
||||
ContentModel.ASSOC_CONTAINS,
|
||||
QName.createQName(NAMESPACE, "depth-" + i),
|
||||
ContentModel.TYPE_FOLDER).getChildRef();
|
||||
ContentModel.TYPE_FOLDER,
|
||||
props).getChildRef();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
@@ -383,4 +388,39 @@ public class NodeServiceTest extends TestCase
|
||||
AssociationRef assocRef = nodeService.getAssoc(Long.MAX_VALUE);
|
||||
assertNull("Should get null for missing ID of association. ", assocRef);
|
||||
}
|
||||
|
||||
public void testDuplicateChildNodeName()
|
||||
{
|
||||
final NodeRef[] liveNodeRefs = new NodeRef[3];
|
||||
final NodeRef workspaceRootNodeRef = nodeService.getRootNode(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE);
|
||||
buildNodeHierarchy(workspaceRootNodeRef, liveNodeRefs);
|
||||
|
||||
// Get the name of the last node
|
||||
final String lastName = (String) nodeService.getProperty(liveNodeRefs[2], ContentModel.PROP_NAME);
|
||||
// Now create a node with the same name
|
||||
RetryingTransactionCallback<NodeRef> newNodeCallback = new RetryingTransactionCallback<NodeRef>()
|
||||
{
|
||||
@Override
|
||||
public NodeRef execute() throws Throwable
|
||||
{
|
||||
Map<QName, Serializable> props = new HashMap<QName, Serializable>(3);
|
||||
props.put(ContentModel.PROP_NAME, lastName);
|
||||
return nodeService.createNode(
|
||||
liveNodeRefs[1],
|
||||
ContentModel.ASSOC_CONTAINS,
|
||||
QName.createQName(NAMESPACE, "duplicate"),
|
||||
ContentModel.TYPE_FOLDER,
|
||||
props).getChildRef();
|
||||
}
|
||||
};
|
||||
try
|
||||
{
|
||||
txnService.getRetryingTransactionHelper().doInTransaction(newNodeCallback);
|
||||
fail("Duplicate child node name not detected.");
|
||||
}
|
||||
catch (DuplicateChildNodeNameException e)
|
||||
{
|
||||
// Expected
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user