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

Fixed ContentData ID node properties to use actual type CONTENT_DATA_ID

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@20788 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2010-06-24 01:00:49 +00:00
parent 069423d0a2
commit 0f1a1a4bc2
5 changed files with 79 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/java/org/alfresco/repo/domain/node/AbstractNodeDAOImpl.java
View File

@@ -1569,10 +1569,23 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
// Remove sys:referenceable
ReferenceablePropertiesEntity.removeReferenceableProperties(node, newProps);
// Get the old properties in the raw format, attempting a shortcut for new nodes
Map<NodePropertyKey, NodePropertyValue> oldPropsRaw = null;
Map<QName, Serializable> oldProps = propertiesCache.getValue(nodeId);
if (oldProps != null && oldProps.isEmpty())
{
// Don't requery
oldPropsRaw = Collections.emptyMap();
isAddOnly = false;
}
else
{
oldPropsRaw = selectNodeProperties(nodeId);
}
// Determine which properties we are interested in. For addition of properties, we only
// need the old properties for the QNames being added. For complete setting of properties,
// we need the full set of old properties.
Map<NodePropertyKey, NodePropertyValue> oldPropsRaw = selectNodeProperties(nodeId);
Set<Long> qnameIdsOfInterest = qnameDAO.convertQNamesToIds(newProps.keySet(), true);
// Get new property raw values
@@ -1617,7 +1630,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
if (newContentData != null)
{
Long newContentDataId = contentDataDAO.createContentData(newContentData).getFirst();
newPropValue = new NodePropertyValue(DataTypeDefinition.CONTENT, newContentDataId);
newPropValue = new NodePropertyValue(DataTypeDefinition.CONTENT, new ContentDataId(newContentDataId));
propsToAdd.put(key, newPropValue);
}
}
@@ -1678,7 +1691,7 @@ public abstract class AbstractNodeDAOImpl implements NodeDAO, BatchingDAO
if (newContentData != null)
{
Long newContentDataId = contentDataDAO.createContentData(newContentData).getFirst();
newPropValue = new NodePropertyValue(DataTypeDefinition.CONTENT, newContentDataId);
newPropValue = new NodePropertyValue(DataTypeDefinition.CONTENT, new ContentDataId(newContentDataId));
propsToAdd.put(key, newPropValue);
}
}