From 62565e913df945b9e37197eb1a386863faee32ba Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Thu, 11 Jun 2015 13:25:01 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 105785: Work around for ACE-3943: SiteService assumes java.lang.String for cm:title and cm:description git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@105944 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/repo/site/SiteServiceImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/repo/site/SiteServiceImpl.java b/source/java/org/alfresco/repo/site/SiteServiceImpl.java index ed253f1e86..0d38981769 100644 --- a/source/java/org/alfresco/repo/site/SiteServiceImpl.java +++ b/source/java/org/alfresco/repo/site/SiteServiceImpl.java @@ -93,7 +93,6 @@ import org.alfresco.service.cmr.search.SearchService; import org.alfresco.service.cmr.security.AccessPermission; import org.alfresco.service.cmr.security.AccessStatus; import org.alfresco.service.cmr.security.AuthorityService; -import org.alfresco.service.cmr.security.AuthorityService.AuthorityFilter; import org.alfresco.service.cmr.security.AuthorityType; import org.alfresco.service.cmr.security.NoSuchPersonException; import org.alfresco.service.cmr.security.PermissionService; @@ -1234,8 +1233,8 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic Map properties = this.directNodeService.getProperties(siteNodeRef); String shortName = (String) properties.get(ContentModel.PROP_NAME); String sitePreset = (String) properties.get(PROP_SITE_PRESET); - String title = (String) properties.get(ContentModel.PROP_TITLE); - String description = (String) properties.get(ContentModel.PROP_DESCRIPTION); + String title = DefaultTypeConverter.INSTANCE.convert(String.class, properties.get(ContentModel.PROP_TITLE)); + String description = DefaultTypeConverter.INSTANCE.convert(String.class, properties.get(ContentModel.PROP_DESCRIPTION)); // Get the visibility of the site SiteVisibility visibility = getSiteVisibility(siteNodeRef); @@ -1784,6 +1783,9 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic } } break; + default: + // TODO: Should error but do not want to break anything here, so will fall through (DH) + break; } } }