### Eclipse Workspace Patch 1.0 #P mailbox-trunk-temp Index: api/src/main/java/org/apache/james/mailbox/model/MailboxQuery.java =================================================================== --- api/src/main/java/org/apache/james/mailbox/model/MailboxQuery.java (revision 1651383) +++ api/src/main/java/org/apache/james/mailbox/model/MailboxQuery.java (working copy) @@ -68,8 +68,11 @@ } this.pathDelimiter = pathDelimiter; + //escape the whole string and replace the wildcard characters + String escapedRegex = ("\\Q" + this.expression + "\\E").replace(""+getFreeWildcard(), "\\E.*\\Q").replace(""+getLocalWildcard(), "\\E[^\\Q" + pathDelimiter + "\\E]*\\Q" ); + // Compile some pattern which is used later - pattern = Pattern.compile(this.expression.replaceAll("\\" + pathDelimiter ,"\\\\" + pathDelimiter).replaceAll("\\*", "\\.\\*").replaceAll("\\%", "[^\\" + pathDelimiter + "]*")); + pattern = Pattern.compile(escapedRegex); } /**