Spring/spring-security
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SEC-1012: Extra fixes to dependent modules following changes to Acl APIs.

Browse Source
This commit is contained in:
Luke Taylor
2008-12-21 02:06:55 +00:00
parent 14c50a9c96
commit 0d7002e322
5 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
taglibs/src/main/java/org/springframework/security/taglibs/authz/AccessControlListTag.java
View File

@@ -36,7 +36,9 @@ import org.springframework.context.ApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils;
import org.springframework.web.util.ExpressionEvaluationUtils;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.StringTokenizer;
@@ -93,7 +95,7 @@ public class AccessControlListTag extends TagSupport {
final String evaledPermissionsString = ExpressionEvaluationUtils.evaluateString("hasPermission", hasPermission,
pageContext);
Permission[] requiredPermissions = null;
List<Permission> requiredPermissions = null;
try {
requiredPermissions = parsePermissionsString(evaledPermissionsString);
@@ -128,7 +130,7 @@ public class AccessControlListTag extends TagSupport {
return Tag.SKIP_BODY;
}
Sid[] sids = sidRetrievalStrategy.getSids(SecurityContextHolder.getContext().getAuthentication());
List<Sid> sids = sidRetrievalStrategy.getSids(SecurityContextHolder.getContext().getAuthentication());
ObjectIdentity oid = objectIdentityRetrievalStrategy.getObjectIdentity(resolvedDomainObject);
// Obtain aclEntrys applying to the current Authentication object
@@ -212,9 +214,9 @@ public class AccessControlListTag extends TagSupport {
}
}
private Permission[] parsePermissionsString(String integersString)
private List<Permission> parsePermissionsString(String integersString)
throws NumberFormatException {
final Set permissions = new HashSet();
final Set<Permission> permissions = new HashSet<Permission>();
final StringTokenizer tokenizer;
tokenizer = new StringTokenizer(integersString, ",", false);
@@ -223,7 +225,7 @@ public class AccessControlListTag extends TagSupport {
permissions.add(BasePermission.buildFromMask(new Integer(integer).intValue()));
}
return (Permission[]) permissions.toArray(new Permission[permissions.size()]);
return new ArrayList<Permission>(permissions);
}
public void setDomainObject(Object domainObject) {