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

Merged HEAD (5.2) to 5.2.N (5.2.1)

Browse Source 
126365 jkaabimofrad: Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2)
      119775 jkaabimofrad: RA-635: Fixed Resource API fwk, where a resource is used to create a node via both JSON and multipart/form-data.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@126710 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Ancuta Morarasu
2016-05-11 10:49:02 +00:00
parent 0459a1bb6b
commit d3d9b37a24
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/rest/framework/webscripts/ResourceWebScriptPost.java
View File

@@ -178,7 +178,7 @@ public class ResourceWebScriptPost extends AbstractResourceWebScript implements
throw new DeletedResourceException("(DELETE) " + resource.getMetaData().getUniqueId()); throw new DeletedResourceException("(DELETE) " + resource.getMetaData().getUniqueId());
} }
if (resObj instanceof MultiPartResourceAction.Create<?>) if (resObj instanceof MultiPartResourceAction.Create<?> && params.getPassedIn() instanceof FormData)
{ {
MultiPartResourceAction.Create<Object> creator = (MultiPartResourceAction.Create<Object>) resObj; MultiPartResourceAction.Create<Object> creator = (MultiPartResourceAction.Create<Object>) resObj;
return creator.create((FormData) params.getPassedIn(), params); return creator.create((FormData) params.getPassedIn(), params);
@@ -205,7 +205,7 @@ public class ResourceWebScriptPost extends AbstractResourceWebScript implements
throw new DeletedResourceException("(DELETE) " + resource.getMetaData().getUniqueId()); throw new DeletedResourceException("(DELETE) " + resource.getMetaData().getUniqueId());
} }
if (resObj instanceof MultiPartRelationshipResourceAction.Create<?>) if (resObj instanceof MultiPartRelationshipResourceAction.Create<?> && params.getPassedIn() instanceof FormData)
{ {
MultiPartRelationshipResourceAction.Create<Object> creator = (MultiPartRelationshipResourceAction.Create<Object>) resObj; MultiPartRelationshipResourceAction.Create<Object> creator = (MultiPartRelationshipResourceAction.Create<Object>) resObj;
return creator.create(params.getEntityId(), (FormData) params.getPassedIn(), params); return creator.create(params.getEntityId(), (FormData) params.getPassedIn(), params);