You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2015/08/11 00:28:08 UTC
logging-log4j2 git commit: Pull up method for us in a new layout I
have in progress for CSV.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 0a7e86125 -> 9a7859e93
Pull up method for us in a new layout I have in progress for CSV.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/9a7859e9
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/9a7859e9
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/9a7859e9
Branch: refs/heads/master
Commit: 9a7859e93275b5da475856799af2ff48517ca132
Parents: 0a7e861
Author: ggregory <gg...@apache.org>
Authored: Mon Aug 10 15:28:04 2015 -0700
Committer: ggregory <gg...@apache.org>
Committed: Mon Aug 10 15:28:04 2015 -0700
----------------------------------------------------------------------
.../log4j/core/layout/AbstractStringLayout.java | 17 +++++++++++++++++
.../logging/log4j/core/layout/PatternLayout.java | 8 +-------
2 files changed, 18 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9a7859e9/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
index cebd27b..075144b 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/AbstractStringLayout.java
@@ -29,6 +29,22 @@ public abstract class AbstractStringLayout extends AbstractLayout<String> {
private static final long serialVersionUID = 1L;
/**
+ * Converts a String to a byte[].
+ *
+ * @param str
+ * if null, return null.
+ * @param charset
+ * if null, use the default charset.
+ * @return a byte[]
+ */
+ static byte[] toBytes(final String str, final Charset charset) {
+ if (str != null) {
+ return str.getBytes(charset != null ? charset : Charset.defaultCharset());
+ }
+ return null;
+ }
+
+ /**
* The charset for the formatted message.
*/
// TODO: Charset is not serializable. Implement read/writeObject() ?
@@ -70,4 +86,5 @@ public abstract class AbstractStringLayout extends AbstractLayout<String> {
public byte[] toByteArray(final LogEvent event) {
return toSerializable(event).getBytes(charset);
}
+
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9a7859e9/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
index b045864..5f8c398 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/layout/PatternLayout.java
@@ -37,6 +37,7 @@ import org.apache.logging.log4j.core.pattern.LogEventPatternConverter;
import org.apache.logging.log4j.core.pattern.PatternFormatter;
import org.apache.logging.log4j.core.pattern.PatternParser;
import org.apache.logging.log4j.core.pattern.RegexReplacement;
+import org.apache.logging.log4j.util.Strings;
/**
* A flexible layout configurable with pattern string.
@@ -134,13 +135,6 @@ public final class PatternLayout extends AbstractStringLayout {
}
}
- private static byte[] toBytes(final String str, final Charset charset) {
- if (str != null) {
- return str.getBytes(charset != null ? charset : Charset.defaultCharset());
- }
- return null;
- }
-
private byte[] strSubstitutorReplace(final byte... b) {
if (b != null && config != null) {
return getBytes(config.getStrSubstitutor().replace(new String(b, getCharset())));