Repository: logging-log4j2 Updated Branches: refs/heads/release-2.x 4a12af136 -> 8f534515d
Inline private StringBuilders.escapeAndDecrement Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8f534515 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8f534515 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8f534515 Branch: refs/heads/release-2.x Commit: 8f534515d900fb5ab5d09ed93cac1dcc3e21954d Parents: 4a12af1 Author: Carter Kozak <[email protected]> Authored: Mon Jul 16 07:10:13 2018 -0400 Committer: Carter Kozak <[email protected]> Committed: Mon Jul 16 10:39:59 2018 -0400 ---------------------------------------------------------------------- .../logging/log4j/util/StringBuilders.java | 28 +++++++++----------- 1 file changed, 13 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8f534515/log4j-api/src/main/java/org/apache/logging/log4j/util/StringBuilders.java ---------------------------------------------------------------------- diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/StringBuilders.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/StringBuilders.java index 2a83b24..505abf1 100644 --- a/log4j-api/src/main/java/org/apache/logging/log4j/util/StringBuilders.java +++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/StringBuilders.java @@ -197,28 +197,33 @@ public final class StringBuilders { final char c = toAppendTo.charAt(i); switch (c) { case '\b': - lastPos = escapeAndDecrement(toAppendTo, lastPos, 'b'); + toAppendTo.setCharAt(lastPos--, 'b'); + toAppendTo.setCharAt(lastPos--, '\\'); break; - case '\t': - lastPos = escapeAndDecrement(toAppendTo, lastPos, 't'); + toAppendTo.setCharAt(lastPos--, 't'); + toAppendTo.setCharAt(lastPos--, '\\'); break; case '\f': - lastPos = escapeAndDecrement(toAppendTo, lastPos, 'f'); + toAppendTo.setCharAt(lastPos--, 'f'); + toAppendTo.setCharAt(lastPos--, '\\'); break; case '\n': - lastPos = escapeAndDecrement(toAppendTo, lastPos, 'n'); + toAppendTo.setCharAt(lastPos--, 'n'); + toAppendTo.setCharAt(lastPos--, '\\'); break; case '\r': - lastPos = escapeAndDecrement(toAppendTo, lastPos, 'r'); + toAppendTo.setCharAt(lastPos--, 'r'); + toAppendTo.setCharAt(lastPos--, '\\'); break; case '"': case '\\': - lastPos = escapeAndDecrement(toAppendTo, lastPos, c); + toAppendTo.setCharAt(lastPos--, c); + toAppendTo.setCharAt(lastPos--, '\\'); break; default: @@ -231,19 +236,12 @@ public final class StringBuilders { toAppendTo.setCharAt(lastPos--, 'u'); toAppendTo.setCharAt(lastPos--, '\\'); } else { - toAppendTo.setCharAt(lastPos, c); - lastPos--; + toAppendTo.setCharAt(lastPos--, c); } } } } - private static int escapeAndDecrement(StringBuilder toAppendTo, int lastPos, char c) { - toAppendTo.setCharAt(lastPos--, c); - toAppendTo.setCharAt(lastPos--, '\\'); - return lastPos; - } - public static void escapeXml(final StringBuilder toAppendTo, final int start) { for (int i = toAppendTo.length() - 1; i >= start; i--) { // backwards: length may change final char c = toAppendTo.charAt(i);
