From 39aa0636547ce2a51d727e63d2aa6977b3e158d7 Mon Sep 17 00:00:00 2001 From: Tuna Aksoy Date: Thu, 23 Jul 2015 22:07:23 +0000 Subject: [PATCH] Fixed failing integration tests git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@108913 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- ...lassificationReasonsPropertyDecorator.java | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/rm-server/source/java/org/alfresco/repo/jscript/app/ClassificationReasonsPropertyDecorator.java b/rm-server/source/java/org/alfresco/repo/jscript/app/ClassificationReasonsPropertyDecorator.java index 33dede6a55..e206a28d93 100644 --- a/rm-server/source/java/org/alfresco/repo/jscript/app/ClassificationReasonsPropertyDecorator.java +++ b/rm-server/source/java/org/alfresco/repo/jscript/app/ClassificationReasonsPropertyDecorator.java @@ -21,7 +21,9 @@ package org.alfresco.repo.jscript.app; import static org.alfresco.util.ParameterCheck.mandatory; import java.io.Serializable; +import java.util.List; +import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.module.org_alfresco_module_rm.classification.ClassificationReason; import org.alfresco.module.org_alfresco_module_rm.classification.ClassificationSchemeService; import org.alfresco.service.cmr.repository.NodeRef; @@ -75,8 +77,25 @@ public class ClassificationReasonsPropertyDecorator extends BasePropertyDecorato mandatory("value", value); JSONArray jsonArray = new JSONArray(); + JSONArray classificationReasonIds = new JSONArray(); + + if (value instanceof String) + { + classificationReasonIds = new Gson().fromJson((String) value, JSONArray.class); + } + else if (value instanceof List) + { + List values = (List) value; + for (String classificationReasonId : values) + { + classificationReasonIds.add(classificationReasonId); + } + } + else + { + throw new AlfrescoRuntimeException("Unexpected value instance: '" + value + "'."); + } - JSONArray classificationReasonIds = new Gson().fromJson(value.toString(), JSONArray.class); for (int i = 0; i < classificationReasonIds.size(); i++) { String classificationReasonId = (String) classificationReasonIds.get(i);