Merged 5.1-MC1 (5.1.0) to HEAD (5.1)

119029 adavis: Merged 5.1.N (5.1.1) to 5.1-MC1 (5.1.0)
      116130 adavis: Merged 5.0.N (5.0.3) to 5.1.N (5.1.1)
         115965 adavis: Merged V4.2-BUG-FIX (4.2.6) to 5.0.N (5.0.3) (PARTIAL MERGE)
            115823 arebegea: MNT-14887 : Rework ChainingUserRegistrySynchronizer's methods that uses RetryingTransaction with 'requiresNew=true'.
               - removed the code that deleted the older property value that may have been present when updating a value.
               - fixed the tests from RepoUsageComponentTest.java
               - updated the authorised-users jar with the version that uses the attributeService again.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@119867 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jean-Pierre Huynh
2015-12-10 09:50:23 +00:00
parent e9c42fa4f3
commit 0f0037ae10

View File

@@ -1427,8 +1427,6 @@ public abstract class AbstractPropertyValueDAOImpl implements PropertyValueDAO
throw new DataIntegrityViolationException("No unique property context exists for id: " + id);
}
Long propertyIdToDelete = entity.getPropertyId();
Long propertyId = null;
if (propertyValue != null)
{
@@ -1443,12 +1441,6 @@ public abstract class AbstractPropertyValueDAOImpl implements PropertyValueDAO
// cache
propertyUniqueContextCache.put(pucKey, entity);
// Clean up the previous property, if present
if (propertyIdToDelete != null)
{
deleteProperty(propertyIdToDelete);
}
// Done
if (logger.isDebugEnabled())
{