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

79113: ACE-484: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud)
      79070: Merged DEV to V4.2-BUG-FIX (4.2.4)
         67851: MNT-11223 : Upgrade OpenCMIS library to 0.11.0 on 4.2 code line
         Updated OpenCMIS to 0.11 version.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82687 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Will Abson
2014-09-03 15:16:06 +00:00
parent 005a0fb137
commit e616ff66ef

View File

@@ -152,6 +152,7 @@ public class ResourceWebScriptHelper
* @param selectParam * @param selectParam
* @return List<String> bean property names potentially using JSON Pointer syntax * @return List<String> bean property names potentially using JSON Pointer syntax
*/ */
@SuppressWarnings("unchecked")
public static List<String> getSelectClause(String selectParam) throws InvalidArgumentException public static List<String> getSelectClause(String selectParam) throws InvalidArgumentException
{ {
if (selectParam == null) return Collections.emptyList(); if (selectParam == null) return Collections.emptyList();
@@ -167,7 +168,6 @@ public class ResourceWebScriptHelper
{ {
return Arrays.asList(selectedPropsTree.getText()); return Arrays.asList(selectedPropsTree.getText());
} }
@SuppressWarnings("unchecked")
List<Tree> children = (List<Tree>) selectedPropsTree.getChildren(); List<Tree> children = (List<Tree>) selectedPropsTree.getChildren();
if (children!= null && !children.isEmpty()) if (children!= null && !children.isEmpty())
{ {