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

source/java/org/alfresco/repo/domain/propval/AbstractPropertyValueDAOImpl.java

@@ -1203,9 +1203,12 @@ public abstract class AbstractPropertyValueDAOImpl implements PropertyValueDAO
             
             return new Pair<Long, Long>(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);