diff options
| -rw-r--r-- | redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java index 3c5f95012..31197c0e3 100644 --- a/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java +++ b/redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultRoleManagementService.java @@ -631,7 +631,11 @@ public class DefaultRoleManagementService Collection<org.apache.archiva.redback.rbac.Role> appRoles = filterApplicationRoles( modelApplication, allRoles, modelApplication.getTemplates() ); - applicationRoles.setGlobalRoles( toRoleNames( appRoles ) ); + List<String> roleNames = new ArrayList<String>( toRoleNames( appRoles ) ); + + Collections.sort( roleNames ); + + applicationRoles.setGlobalRoles( roleNames ); Set<String> resources = discoverResources( modelApplication.getTemplates(), appRoles ); @@ -651,8 +655,12 @@ public class DefaultRoleManagementService } } + Collections.sort( appRoleNames ); + applicationRoles.setGlobalRoles( appRoleNames ); + Collections.sort( appRoleNames ); + applicationRolesList.add( applicationRoles ); } |