From c8cca900c0477bee7403941aa6efa4603c8143f1 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Sat, 31 Jan 2015 11:22:28 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 91358: Merged V4.2-BUG-FIX (4.2.5) to HEAD-BUG-FIX (5.0/Cloud) 91138: Merged DEV to V4.2-BUG-FIX (4.2.5) 91059 : MNT-12680: Alfresco 4.0/4.2 AtomPub cmis:createdDate value mapping for versions is different then Alfresco 3.4 AtomPub binding results - Extracting "creationDate" property via filter, like in v3.4 91139: MNT-12680: Alfresco 4.0/4.2 AtomPub cmis:createdDate value mapping for versions is different then Alfresco 3.4 AtomPub binding results - Reverted "merge" to incorrect branch 91260: Merged V4.2.4 (4.2.4) to V4.2-BUG-FIX (4.2.5) (RECORD ONLY) 91156: Merged DEV to V4.2-BUG-FIX (4.2.4) 91059 : MNT-12680: Alfresco 4.0/4.2 AtomPub cmis:createdDate value mapping for versions is different then Alfresco 3.4 AtomPub binding results - Extracting "creationDate" property via filter, like in v3.4 91264: Merged V4.2.4 (4.2.4) to V4.2-BUG-FIX (4.2.5) (RECORD ONLY) 91181: Reverse Merged V4.2-BUG-FIX (4.2.5) to V4.2.4 (4.2.4) 91156: Merged DEV to V4.2-BUG-FIX (4.2.4) 91059 : MNT-12680: Alfresco 4.0/4.2 AtomPub cmis:createdDate value mapping for versions is different then Alfresco 3.4 AtomPub binding results - Extracting "creationDate" property via filter, like in v3.4 91161: Merged DEV to PATCHES/4.2.4 91109 : MNT-12496: CMIS: Unable to navigate to a folder if it has image with special character on the metadata - Escaping of control characters was added 90723 : MNT-12496: CMIS: Unable to navigate to a folder if it has image with special character on the metadata - Added tests to check incorrect char in description property of node. 91342: Merged V4.2.4 (4.2.4) to V4.2-BUG-FIX (4.2.5) 91254: Merged DEV to PATCHES/4.2.4 91232 : MNT-12680: Alfresco 4.0/4.2 AtomPub cmis:createdDate value mapping for versions is different then Alfresco 3.4 AtomPub binding results - Extracting "creationDate" property via filter, like in v3.4 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94785 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/opencmis/CMISNodeInfoImpl.java | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/source/java/org/alfresco/opencmis/CMISNodeInfoImpl.java b/source/java/org/alfresco/opencmis/CMISNodeInfoImpl.java index b6d3e0dcdd..4e49f0a6d2 100644 --- a/source/java/org/alfresco/opencmis/CMISNodeInfoImpl.java +++ b/source/java/org/alfresco/opencmis/CMISNodeInfoImpl.java @@ -838,19 +838,12 @@ public class CMISNodeInfoImpl implements CMISNodeInfo public Serializable getCreationDate() { - if (isDocument()) - { - if (isCurrentVersion() || isPWC()) - { - return connector.getNodeService().getProperty(nodeRef, ContentModel.PROP_CREATED); - } else - { - return getVersion().getVersionProperty(VersionBaseModel.PROP_CREATED_DATE); - } - } else if (isFolder() || isItem()) + // MNT-12680 we should return always creation date of original node + if (isDocument() || isFolder()) { return connector.getNodeService().getProperty(nodeRef, ContentModel.PROP_CREATED); - } else + } + else { return DUMMY_DATE; }