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

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

Browse Source 
78609: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      78259: MNT-11895: Merged DEV to V4.2-BUG-FIX (4.2.4)
         78245: MNT-11895: Attribute Service Entries with "Serializable" objects in key Segments are not guaranteed to be unique
            - Dissallow attributeService entries with "Serializable" objects in key Segments because they are not guaranteed to be unique. Add unit test.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82620 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Erik Winlof
2014-09-03 12:45:04 +00:00
parent 401ad0a76d
commit e8faa3cd77
5 changed files with 207 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
source/java/org/alfresco/repo/domain/propval/AbstractPropertyValueDAOImpl.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2013 Alfresco Software Limited.
* Copyright (C) 2005-2014 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -129,6 +129,19 @@ public abstract class AbstractPropertyValueDAOImpl implements PropertyValueDAO
private SimpleCache<CachePucKey, PropertyUniqueContextEntity> propertyUniqueContextCache; // cluster-aware
/**
* Flag to throw exception if type of the key doesn't guarantee uniqueness, @see MNT-11895
*/
private boolean uniquenessCheckEnabled = true;
/**
* Setter for uniquenessCheckEnabled flag
*/
public void setUniquenessCheckEnabled(boolean uniquenessCheckEnabled)
{
this.uniquenessCheckEnabled = uniquenessCheckEnabled;
}
/**
* Set the cache to use for unique property lookups
*/
@@ -1162,13 +1175,37 @@ public abstract class AbstractPropertyValueDAOImpl implements PropertyValueDAO
}
}
private void checkUniquenessGuarantee(Serializable... values)
{
for (int i = 0; i < values.length; i++)
{
PersistedType persistedType = PropertyValueEntity.getPersistedTypeEnum(values[i], converter);
if (persistedType == PersistedType.SERIALIZABLE)
{
if (uniquenessCheckEnabled)
{
throw new IllegalArgumentException("Type of the KEY-" + i + " (" + values[i].getClass() + ") cannot guarantee uniqueness. " +
"Please, see https://issues.alfresco.com/jira/browse/MNT-11895 for details. " +
"Set system.propval.uniquenessCheck.enabled=false to not throw the exception.");
}
else
{
logger.warn("Type of the KEY-" + i + " (" + values[i].getClass() + ") cannot guarantee uniqueness. " +
"Please, see https://issues.alfresco.com/jira/browse/MNT-11895 for details. " +
"Set system.propval.uniquenessCheck.enabled=true to throw the exception.");
}
}
}
}
public Pair<Long, Long> createPropertyUniqueContext(
Serializable value1, Serializable value2, Serializable value3,
Serializable propertyValue1)
{
/*
* Use savepoints so that the PropertyUniqueConstraintViolation can be caught and handled in-transactioin
* Use savepoints so that the PropertyUniqueConstraintViolation can be caught and handled in-transaction
*/
checkUniquenessGuarantee(value1, value2, value3);
// Translate the properties. Null values are acceptable
Long id1 = getOrCreatePropertyValue(value1).getFirst();