Repository: shiro Updated Branches: refs/heads/master 12b599d41 -> ab9025951
SHIRO-562: Avoid calling trim() twice Project: http://git-wip-us.apache.org/repos/asf/shiro/repo Commit: http://git-wip-us.apache.org/repos/asf/shiro/commit/ab902595 Tree: http://git-wip-us.apache.org/repos/asf/shiro/tree/ab902595 Diff: http://git-wip-us.apache.org/repos/asf/shiro/diff/ab902595 Branch: refs/heads/master Commit: ab90259510fd98a29f73b44b368e80dd0ec97898 Parents: 12b599d Author: Andreas Kohn <[email protected]> Authored: Fri Mar 18 14:17:48 2016 +0100 Committer: bdemers <[email protected]> Committed: Mon Mar 21 12:06:01 2016 -0400 ---------------------------------------------------------------------- .../org/apache/shiro/authz/permission/WildcardPermission.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/shiro/blob/ab902595/core/src/main/java/org/apache/shiro/authz/permission/WildcardPermission.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/shiro/authz/permission/WildcardPermission.java b/core/src/main/java/org/apache/shiro/authz/permission/WildcardPermission.java index 1a755ee..cb9d14e 100644 --- a/core/src/main/java/org/apache/shiro/authz/permission/WildcardPermission.java +++ b/core/src/main/java/org/apache/shiro/authz/permission/WildcardPermission.java @@ -20,6 +20,7 @@ package org.apache.shiro.authz.permission; import org.apache.shiro.authz.Permission; import org.apache.shiro.util.CollectionUtils; +import org.apache.shiro.util.StringUtils; import java.io.Serializable; import java.util.ArrayList; @@ -147,12 +148,12 @@ public class WildcardPermission implements Permission, Serializable { } protected void setParts(String wildcardString, boolean caseSensitive) { - if (wildcardString == null || wildcardString.trim().length() == 0) { + wildcardString = StringUtils.clean(wildcardString); + + if (wildcardString == null || wildcardString.isEmpty()) { throw new IllegalArgumentException("Wildcard string cannot be null or empty. Make sure permission strings are properly formatted."); } - wildcardString = wildcardString.trim(); - List<String> parts = CollectionUtils.asList(wildcardString.split(PART_DIVIDER_TOKEN)); this.parts = new ArrayList<Set<String>>();
