inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)

Browse Source 
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
This commit is contained in:
Will Abson
2014-06-25 16:34:55 +00:00
parent 732b8a48e0
commit 41f0796f63
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/opencmis/CMISConnector.java
View File

@@ -1895,6 +1895,7 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
{ {
List<CmisExtensionElement> extensions = new ArrayList<CmisExtensionElement>(); List<CmisExtensionElement> extensions = new ArrayList<CmisExtensionElement>();
Set<String> propertyIds = new HashSet<String>(alreadySetProperties); Set<String> propertyIds = new HashSet<String>(alreadySetProperties);
List<CmisExtensionElement> propertyExtensionList = new ArrayList<CmisExtensionElement>();
Set<String> filterSet = splitFilter(filter); Set<String> filterSet = splitFilter(filter);
Set<QName> aspects = nodeService.getAspects(info.getNodeRef()); 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 extensions.add(new CmisExtensionElementImpl(ALFRESCO_EXTENSION_NAMESPACE, APPLIED_ASPECTS, null, aspectType
.getTypeId())); .getTypeId()));
List<CmisExtensionElement> propertyExtensionList = new ArrayList<CmisExtensionElement>();
for (PropertyDefinitionWrapper propDef : aspectType.getProperties()) for (PropertyDefinitionWrapper propDef : aspectType.getProperties())
{ {
if (propertyIds.contains(propDef.getPropertyId())) if (propertyIds.contains(propDef.getPropertyId()))
@@ -1930,6 +1930,7 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
// mark property as 'added' // mark property as 'added'
propertyIds.add(propDef.getPropertyId()); propertyIds.add(propDef.getPropertyId());
} }
}
if (!propertyExtensionList.isEmpty()) if (!propertyExtensionList.isEmpty())
{ {
@@ -1937,7 +1938,6 @@ public class CMISConnector implements ApplicationContextAware, ApplicationListen
ALFRESCO_EXTENSION_NAMESPACE, "properties", null, propertyExtensionList); ALFRESCO_EXTENSION_NAMESPACE, "properties", null, propertyExtensionList);
extensions.addAll(Collections.singletonList(propertiesExtension)); extensions.addAll(Collections.singletonList(propertiesExtension));
} }
}
return extensions; return extensions;
} }