From 40fc727b0d6d89e5e76de130c30afe50aa1008f0 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Tue, 31 Mar 2015 23:13:09 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 100844: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) 100755: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2) 99877: Merged V4.1-BUG-FIX (4.1.10) to V4.2-BUG-FIX (4.2.5) 99796: MNT-10999: CMIS: Version is not increased after deleting Content Stream git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@100914 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/opencmis/CMISConnector.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/source/java/org/alfresco/opencmis/CMISConnector.java b/source/java/org/alfresco/opencmis/CMISConnector.java index 7a881d40f1..cc2b67140a 100644 --- a/source/java/org/alfresco/opencmis/CMISConnector.java +++ b/source/java/org/alfresco/opencmis/CMISConnector.java @@ -1448,11 +1448,7 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen { if (!nodeService.hasAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE)) { - Map props = new HashMap(); - props.put(ContentModel.PROP_INITIAL_VERSION, false); - props.put(ContentModel.PROP_AUTO_VERSION, false); - props.put(ContentModel.PROP_AUTO_VERSION_PROPS, false); - nodeService.addAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE, props); + nodeService.addAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE, null); } Map versionProperties = new HashMap(5); @@ -1465,11 +1461,7 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen { if (!nodeService.hasAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE)) { - Map props = new HashMap(); - props.put(ContentModel.PROP_INITIAL_VERSION, false); - props.put(ContentModel.PROP_AUTO_VERSION, false); - props.put(ContentModel.PROP_AUTO_VERSION_PROPS, false); - nodeService.addAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE, props); + nodeService.addAspect(nodeRef, ContentModel.ASPECT_VERSIONABLE, null); } Map versionProperties = new HashMap(5);