Merged V3.0 to HEAD

11360: Fixed MySQL upgrade path from pre-2.9: Copying the user usage data is now optional as the table might be missing.
   11363: Merged V2.2 to V3.0
      11320: Fixed ETWOTWO-747: Incorrect historical tables created during Oracle upgrade
      11336: Upgrade script optimizations
      11340: Fix for ETWOTWO-752: Expired content task shows all items in the web project
      11362: Fixed ETHREEOH-402: Error while attempting to set node DB ID and other unsettable properties
   11367: Removed old blog detritus


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12423 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-12-17 05:15:35 +00:00
parent 346767096f
commit 23af538c1a
8 changed files with 32 additions and 89 deletions

View File

@@ -1039,8 +1039,15 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl
Long nodeId = nodePair.getFirst();
// Ensure that we are not setting intrinsic properties
Map<QName, Serializable> properties = Collections.singletonMap(qname, value);
Map<QName, Serializable> properties = new HashMap<QName, Serializable>(1, 1.0F);
properties.put(qname, value);
extractIntrinsicProperties(properties);
// Shortcut if nothing is left
if (properties.size() == 0)
{
return;
}
// Get the properties from before
Map<QName, Serializable> propertiesBefore = getPropertiesImpl(nodePair);