You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2014/05/26 02:15:58 UTC
svn commit: r1597492 -
/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacement.java
Author: mattsicker
Date: Mon May 26 00:15:58 2014
New Revision: 1597492
URL: http://svn.apache.org/r1597492
Log:
Migrate RegexReplacement plugin to use typed parameters.
Modified:
logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacement.java
Modified: logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacement.java
URL: http://svn.apache.org/viewvc/logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacement.java?rev=1597492&r1=1597491&r2=1597492&view=diff
==============================================================================
--- logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacement.java (original)
+++ logging/log4j/log4j2/trunk/log4j-core/src/main/java/org/apache/logging/log4j/core/pattern/RegexReplacement.java Mon May 26 00:15:58 2014
@@ -69,7 +69,7 @@ public final class RegexReplacement {
*/
@PluginFactory
public static RegexReplacement createRegexReplacement(
- @PluginAttribute("regex") final String regex,
+ @PluginAttribute("regex") final Pattern regex,
@PluginAttribute("replacement") final String replacement) {
if (regex == null) {
LOGGER.error("A regular expression is required for replacement");
@@ -78,8 +78,8 @@ public final class RegexReplacement {
if (replacement == null) {
LOGGER.error("A replacement string is required to perform replacement");
}
- final Pattern p = Pattern.compile(regex);
- return new RegexReplacement(p, replacement);
+ // FIXME: should we use Matcher.quoteReplacement() here?
+ return new RegexReplacement(regex, replacement);
}
}