From 41f0796f639be173e7f2fd3b4922dec71e416496 Mon Sep 17 00:00:00 2001
From: Will Abson <will.abson@alfresco.com>
Date: Wed, 25 Jun 2014 16:34:55 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)    74317:
 Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (5.0/Cloud)       74274: Merged
 DEV to V4.2-BUG-FIX (4.2.3)          73971 : MNT-11227 : getObjectResponse
 does not provide a valid xml response against Alfresco-Core.xsd             
 - Changing order of elements in xml response for getObject method

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74897 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../java/org/alfresco/opencmis/CMISConnector.java  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/source/java/org/alfresco/opencmis/CMISConnector.java b/source/java/org/alfresco/opencmis/CMISConnector.java
index bd388f55ee..f7eda0461e 100644
--- a/source/java/org/alfresco/opencmis/CMISConnector.java
+++ b/source/java/org/alfresco/opencmis/CMISConnector.java
@@ -1895,6 +1895,7 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
     {
         List<CmisExtensionElement> extensions = new ArrayList<CmisExtensionElement>();
         Set<String> propertyIds = new HashSet<String>(alreadySetProperties);
+        List<CmisExtensionElement> propertyExtensionList = new ArrayList<CmisExtensionElement>();
         Set<String> filterSet = splitFilter(filter);
 
         Set<QName> aspects = nodeService.getAspects(info.getNodeRef());
@@ -1909,7 +1910,6 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
             extensions.add(new CmisExtensionElementImpl(ALFRESCO_EXTENSION_NAMESPACE, APPLIED_ASPECTS, null, aspectType
                     .getTypeId()));
 
-            List<CmisExtensionElement> propertyExtensionList = new ArrayList<CmisExtensionElement>();
             for (PropertyDefinitionWrapper propDef : aspectType.getProperties())
             {
                 if (propertyIds.contains(propDef.getPropertyId()))
@@ -1930,13 +1930,13 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
                 // mark property as 'added'
                 propertyIds.add(propDef.getPropertyId());
             }
+        }
 
-            if (!propertyExtensionList.isEmpty())
-            {
-                CmisExtensionElementImpl propertiesExtension = new CmisExtensionElementImpl(
-                        ALFRESCO_EXTENSION_NAMESPACE, "properties", null, propertyExtensionList);
-                extensions.addAll(Collections.singletonList(propertiesExtension));
-            }
+        if (!propertyExtensionList.isEmpty())
+        {
+            CmisExtensionElementImpl propertiesExtension = new CmisExtensionElementImpl(
+                    ALFRESCO_EXTENSION_NAMESPACE, "properties", null, propertyExtensionList);
+            extensions.addAll(Collections.singletonList(propertiesExtension));
         }
 
         return extensions;