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

REPO-1682 / MNT-15447: getCurrentVersion(node) throws ConcurrencyFailureException after creating multiple versions of a node

Browse Source 
- Throw IllegalArgumentException when not a 'live' noderef is used for retrieving the current version.
   - Added Junit test.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@133884 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-12-19 12:05:24 +00:00
parent 9c99f44e0e
commit 9794eb72dc
3 changed files with 50 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/java/org/alfresco/repo/version/Version2ServiceImpl.java
View File

@@ -862,33 +862,39 @@ public class Version2ServiceImpl extends VersionServiceImpl implements VersionSe
}
/**
* Gets current version of the passed node ref
* Gets current version of the passed node reference. The node reference is expected to be the 'live' node.
*
* This uses the version label as a mechanism for looking up the version node.
*/
private Pair<Boolean, Version> getCurrentVersionImpl(NodeRef versionHistoryRef, NodeRef nodeRef)
{
// The noderef should not be a version type node.
if (Version2Model.STORE_ID.equals(nodeRef.getStoreRef().getIdentifier()))
{
throw new IllegalArgumentException("The node reference " + nodeRef + " is pointing to a version node, when a reference to a live node is expected.");
}
Pair<Boolean, Version> result = null;
String versionLabel = (String)this.nodeService.getProperty(nodeRef, ContentModel.PROP_VERSION_LABEL);
// note: resultant list is ordered by (a) explicit index and (b) association creation time
// Note: resultant list is ordered by (a) explicit index and (b) association creation time
List<ChildAssociationRef> versionAssocs = getVersionAssocs(versionHistoryRef, false);
// Current version should be head version (since no branching)
int cnt = versionAssocs.size();
for (int i = cnt; i > 0; i--)
int versionCount = versionAssocs.size();
for (int i = versionCount; i > 0; i--)
{
ChildAssociationRef versionAssoc = versionAssocs.get(i-1);
String tempLabel = (String)this.dbNodeService.getProperty(versionAssoc.getChildRef(), Version2Model.PROP_QNAME_VERSION_LABEL);
if (tempLabel != null && tempLabel.equals(versionLabel) == true)
{
boolean headVersion = (i == cnt);
boolean headVersion = (i == versionCount);
if (! headVersion)
if (!headVersion)
{
throw new ConcurrencyFailureException("Unexpected: current version does not appear to be 1st version in the list ["+versionHistoryRef+", "+nodeRef+"]");
throw new ConcurrencyFailureException("Unexpected: current version does not appear to be 1st version in the list ["+versionHistoryRef+", "+nodeRef+"]");
}
result = new Pair<Boolean, Version>(headVersion, getVersion(versionAssoc.getChildRef()));
@@ -902,7 +908,7 @@ public class Version2ServiceImpl extends VersionServiceImpl implements VersionSe
/**
* Check if versions are marked with invalid version label, if true > apply default serial version label (e.g. "1.0", "1.1")
*
* @param versionHistory a version histore node reference
* @param versionHistory a version history node reference
* @param nodeRef a node reference
*/
private void checkForCorruptedVersions(NodeRef versionHistory, NodeRef nodeRef)