From 3980848d1eaaeebb5ee02a87b9e686f988f9d360 Mon Sep 17 00:00:00 2001 From: Jamal Kaabi-Mofrad Date: Tue, 10 May 2016 10:50:39 +0000 Subject: [PATCH] Merged FILE-FOLDER-API (5.2.0) to HEAD (5.2) 121767 jvonka: REST fwk - fix MapBasedQueryWalker to also allow requested String type (in addition to Boolean, Integer, Date) - found whilst implementing nodeType filtering RA-741, RA-685, RA-634 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@126416 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/rest/workflow/api/impl/MapBasedQueryWalker.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/rest/workflow/api/impl/MapBasedQueryWalker.java b/source/java/org/alfresco/rest/workflow/api/impl/MapBasedQueryWalker.java index 931d42c6ff..60367cac1f 100644 --- a/source/java/org/alfresco/rest/workflow/api/impl/MapBasedQueryWalker.java +++ b/source/java/org/alfresco/rest/workflow/api/impl/MapBasedQueryWalker.java @@ -309,9 +309,9 @@ public class MapBasedQueryWalker extends WalkerCallbackAdapter if (stringValue != null) { result = ConvertUtils.convert(stringValue, returnType); - if (result instanceof String) + if ((result instanceof String) && (! returnType.equals(String.class))) { - // If a string is returned, no converter has been found + // If a string is returned, no converter has been found (for non-String return type) throw new IllegalArgumentException("Unable to convert parameter to type: " + returnType.getName()); } }