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

Merged BRANCHES/DEV/V4.1-BUG-FIX to HEAD

Browse Source 
44117: ALF-16979 - Invalid JSON template is produced when 'Infinity' or '-Infinity' values are rendered by ?c FreeMarker built-in. Also fixes number output when rendered by JSONConversionComponent.propertyToJSON() Java backed JSON output.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@44119 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2012-11-28 17:12:09 +00:00
parent e118d14687
commit 2c7f710751
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/java/org/alfresco/repo/jscript/app/JSONConversionComponent.java
View File

@@ -32,6 +32,7 @@ import org.alfresco.service.namespace.QName;
import org.alfresco.util.ISO8601DateFormat; import org.alfresco.util.ISO8601DateFormat;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.json.JSONException;
import org.json.simple.JSONArray; import org.json.simple.JSONArray;
import org.json.simple.JSONAware; import org.json.simple.JSONAware;
import org.json.simple.JSONObject; import org.json.simple.JSONObject;
@@ -298,12 +299,21 @@ public class JSONConversionComponent
else if (value instanceof List) else if (value instanceof List)
{ {
// Convert the List to a JSON list by recursively calling propertyToJSON // Convert the List to a JSON list by recursively calling propertyToJSON
List jsonList = new ArrayList(((List) value).size()); List<Object> jsonList = new ArrayList<Object>(((List<Serializable>) value).size());
for (Object listItem : (List) value) { for (Serializable listItem : (List<Serializable>) value)
jsonList.add(propertyToJSON(nodeRef, propertyName, key, (Serializable) listItem)); {
jsonList.add(propertyToJSON(nodeRef, propertyName, key, listItem));
} }
return jsonList; return jsonList;
} }
else if (value instanceof Double)
{
return (Double.isInfinite((Double)value) || Double.isNaN((Double)value) ? null : value.toString());
}
else if (value instanceof Float)
{
return (Float.isInfinite((Float)value) || Float.isNaN((Float)value) ? null : value.toString());
}
else else
{ {
return value.toString(); return value.toString();
@@ -338,12 +348,10 @@ public class JSONConversionComponent
catch (NamespaceException ne) catch (NamespaceException ne)
{ {
// ignore properties that do not have a registered namespace // ignore properties that do not have a registered namespace
if (logger.isDebugEnabled() == true) if (logger.isDebugEnabled())
{
logger.debug("Ignoring property '" + propertyName + "' as its namespace is not registered"); logger.debug("Ignoring property '" + propertyName + "' as its namespace is not registered");
} }
} }
}
return propertiesJSON; return propertiesJSON;
} }