inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged DEV to HEAD

Browse Source 
48863: ALF-18012 Error occurs on search by wildcards on Start Workflow page
          - []{} symbols escaped in GetAuthoritiesCannedQuery.getPattern(String).
   Also neatened the replacement to be self-documenting


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@48865 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2013-04-05 10:30:37 +00:00
parent 4676411f41
commit d542afaa5c
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/java/org/alfresco/repo/security/authority/GetAuthoritiesCannedQuery.java
View File

@@ -118,10 +118,18 @@ public class GetAuthoritiesCannedQuery extends AbstractCannedQueryPermissions<Au
{ {
return null; return null;
} }
// Escapes: \ with \\ and . with \. // Escape characters of regex expressions
// Replaces ? with . and * with .* searchValue =
searchValue = "^"+searchValue.replaceAll("\\\\", "\\\\\\\\").replaceAll("\\.", "\\\\.").replaceAll("\\?", ".").replaceAll("\\*", ".*"); "^" +
searchValue.replaceAll("\\\\", "\\\\\\\\")
.replaceAll("\\.", "\\\\.")
.replaceAll("\\?", ".")
.replaceAll("\\*", ".*")
.replaceAll("\\{", "\\\\{")
.replaceAll("\\}", "\\\\}")
.replaceAll("\\[", "\\\\[")
.replaceAll("\\]", "\\\\]");
return Pattern.compile(searchValue, Pattern.CASE_INSENSITIVE); return Pattern.compile(searchValue, Pattern.CASE_INSENSITIVE);
} }