From 49650460f005c9875d5bee236962f9cb0f549ec1 Mon Sep 17 00:00:00 2001 From: Will Abson Date: Wed, 25 Jun 2014 15:44:54 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud) 73012: Added removal of individual property value cache entries if the triplet key fails. - Force the retry to go back to the DB for property value IDs. - ACE-1782: Non-unique values for unique constraint: .tenantUsages-00017.02.example.com-fileUsage git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74751 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/domain/propval/AbstractPropertyValueDAOImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/repo/domain/propval/AbstractPropertyValueDAOImpl.java b/source/java/org/alfresco/repo/domain/propval/AbstractPropertyValueDAOImpl.java index 13ba78d3f6..24fb6bb2ac 100644 --- a/source/java/org/alfresco/repo/domain/propval/AbstractPropertyValueDAOImpl.java +++ b/source/java/org/alfresco/repo/domain/propval/AbstractPropertyValueDAOImpl.java @@ -1203,9 +1203,12 @@ public abstract class AbstractPropertyValueDAOImpl implements PropertyValueDAO return new Pair(entity.getId(), property1Id); } - catch (Throwable e) + catch (Exception e) { - // Remove from cache + // Remove from caches. The individual values must also be removed in case they are incorrect. + propertyValueCache.removeByValue(value1); + propertyValueCache.removeByValue(value2); + propertyValueCache.removeByValue(value3); propertyUniqueContextCache.remove(pucKey); controlDAO.rollbackToSavepoint(savepoint);