From 7941d79c51e39372f0a2d22d4180a9327743e18c Mon Sep 17 00:00:00 2001 From: Derek Hulley Date: Fri, 13 Mar 2009 04:42:47 +0000 Subject: [PATCH] Fixed (subject to review) string parsing to get site names - Some values didn't have roles - Still leaves the test failing on "// TODO - update this, if sites support groups" git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13622 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../java/org/alfresco/repo/site/SiteServiceImpl.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/site/SiteServiceImpl.java b/source/java/org/alfresco/repo/site/SiteServiceImpl.java index b69864ed9e..ed6e8625e4 100644 --- a/source/java/org/alfresco/repo/site/SiteServiceImpl.java +++ b/source/java/org/alfresco/repo/site/SiteServiceImpl.java @@ -648,7 +648,17 @@ public class SiteServiceImpl implements SiteService, SiteModel if (group.startsWith(GROUP_SITE_PREFIX)) { int roleIndex = group.lastIndexOf('_'); - siteNames.add(group.substring(GROUP_SITE_PREFIX_LENGTH, roleIndex)); + String siteName; + if (roleIndex + 1 <= GROUP_SITE_PREFIX_LENGTH) + { + // There is no role associated + siteName = group.substring(GROUP_SITE_PREFIX_LENGTH); + } + else + { + siteName = group.substring(GROUP_SITE_PREFIX_LENGTH, roleIndex); + } + siteNames.add(siteName); } }