commit f3bfcd8284c67547a0064a672483915c01264955
author Alex Rudyy <orudyy@apache.org> Mon Sep 04 13:02:43 2017 +0100
committer Keith Wall <kwall@apache.org> Wed Nov 22 16:06:04 2017 +0000
tree 65b9076de63d4d16ed26194c1dda4e8a17554b7a
parent d9f3515dd58a9fc10bb95cb44f53b964e121be2a

QPID-7892: [Java Broker] Use Pattern#quote instead of own regexp escaping

Cherry picked from 6.1.x b1eecae10f741f1564d1b04982da6be3427481e4

broker-core/src/main/java/org/apache/qpid/server/logging/logback/RollingPolicyDecorator.java

diff --git a/broker-core/src/main/java/org/apache/qpid/server/logging/logback/RollingPolicyDecorator.java b/broker-core/src/main/java/org/apache/qpid/server/logging/logback/RollingPolicyDecorator.java
index 0d20a22..2d56156 100644
--- a/broker-core/src/main/java/org/apache/qpid/server/logging/logback/RollingPolicyDecorator.java
+++ b/broker-core/src/main/java/org/apache/qpid/server/logging/logback/RollingPolicyDecorator.java
@@ -295,7 +295,6 @@
 
     private static class FilePathBaseFolderAndPatternPair
     {
-        private static Pattern REGEX_SPECIAL_CHARACTERS = Pattern.compile("[{}()\\[\\].+*?^$\\\\|]");
         private final Path _baseFolder;
         private final Pattern _pattern;
 
@@ -318,12 +317,7 @@
                 path = System.getProperty("user.dir");
             }
             _baseFolder = new File(path).toPath().toAbsolutePath();
-            _pattern = Pattern.compile(escape(path) + "/" + fileNamePattern);
-        }
-
-        private String escape(String string)
-        {
-            return REGEX_SPECIAL_CHARACTERS.matcher(string).replaceAll("\\\\$0");
+            _pattern = Pattern.compile(Pattern.quote(path) + "/" + fileNamePattern);
         }
 
         public Path getBaseFolder()