From 5cdfb8b2f7fdd3c20dca069346ce1ef85a0e1416 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Wed, 20 May 2015 10:38:05 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 104503: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) 104354: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2) 104274: Merged DEV (4.2.5) to V4.2-BUG-FIX (4.2.5) 102794: MNT-8678 : call to guessMimetype() on a node that has no content creates a content property - add check for empty content before saving a node git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104627 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../java/org/alfresco/repo/jscript/ScriptNode.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/jscript/ScriptNode.java b/source/java/org/alfresco/repo/jscript/ScriptNode.java index af87ee9965..427036b0a6 100644 --- a/source/java/org/alfresco/repo/jscript/ScriptNode.java +++ b/source/java/org/alfresco/repo/jscript/ScriptNode.java @@ -1693,11 +1693,22 @@ public class ScriptNode implements Scopeable, NamespacePrefixResolverProvider for (String key : this.properties.keySet()) { Serializable value = (Serializable) this.properties.get(key); + QName qname= createQName(key); + + // MNT-8678 + if (ContentModel.PROP_CONTENT.equals(qname) && (value instanceof ScriptContentData)) + { + ScriptContentData contentData = (ScriptContentData) value; + if (contentData.getSize() == 0) + { + continue; + } + } // perform the conversion from script wrapper object to repo serializable values value = getValueConverter().convertValueForRepo(value); - props.put(createQName(key), value); + props.put(qname, value); } this.nodeService.setProperties(this.nodeRef, props); }