Fixed failing integration tests

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@108913 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2015-07-23 22:07:23 +00:00
parent 4376c2a152
commit 39aa063654

View File

@@ -21,7 +21,9 @@ package org.alfresco.repo.jscript.app;
import static org.alfresco.util.ParameterCheck.mandatory; import static org.alfresco.util.ParameterCheck.mandatory;
import java.io.Serializable; 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.ClassificationReason;
import org.alfresco.module.org_alfresco_module_rm.classification.ClassificationSchemeService; import org.alfresco.module.org_alfresco_module_rm.classification.ClassificationSchemeService;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
@@ -75,8 +77,25 @@ public class ClassificationReasonsPropertyDecorator extends BasePropertyDecorato
mandatory("value", value); mandatory("value", value);
JSONArray jsonArray = new JSONArray(); 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<String> values = (List<String>) 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++) for (int i = 0; i < classificationReasonIds.size(); i++)
{ {
String classificationReasonId = (String) classificationReasonIds.get(i); String classificationReasonId = (String) classificationReasonIds.get(i);