You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2015/10/13 06:09:42 UTC
[46/50] logging-log4j2 git commit: LOG4J2-1151 better variable and
method names, added comment
LOG4J2-1151 better variable and method names, added comment
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8c1bb39d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8c1bb39d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8c1bb39d
Branch: refs/heads/master
Commit: 8c1bb39d975cc7b7ad24e685b86cfc8c170c44c6
Parents: efa2c82
Author: rpopma <rp...@apache.org>
Authored: Tue Oct 6 16:09:53 2015 +0200
Committer: Ralph Goers <rg...@nextiva.com>
Committed: Sun Oct 11 12:40:44 2015 -0700
----------------------------------------------------------------------
.../log4j/core/layout/AbstractStringLayout.java | 26 +++++++++++---------
1 file changed, 15 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8c1bb39d/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 bb4ad1c..c928d62 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
@@ -133,12 +133,16 @@ public abstract class AbstractStringLayout extends AbstractLayout<String> {
private static byte[] encodeSingleByteChars(String s) {
final int length = s.length();
final byte[] result = new byte[length];
- encode(s, 0, length, result);
+ encodeString(s, 0, length, result);
return result;
}
// LOG4J2-1151
- private static int encodeISOArray(String charArray, int charIndex, byte[] byteArray, int byteIndex, int length) {
+ /*
+ * Implementation note: this is the fast path. If the char array contains only ISO-8859-1 characters, all the work
+ * will be done here.
+ */
+ private static int encodeIsoChars(String charArray, int charIndex, byte[] byteArray, int byteIndex, int length) {
int i = 0;
for (; i < length; i++) {
char c = charArray.charAt(charIndex++);
@@ -151,15 +155,15 @@ public abstract class AbstractStringLayout extends AbstractLayout<String> {
}
// LOG4J2-1151
- private static int encode(String charArray, int charOffset, int charLength, byte[] byteArray) {
- int offset = 0;
+ private static int encodeString(String charArray, int charOffset, int charLength, byte[] byteArray) {
+ int byteOffset = 0;
int length = Math.min(charLength, byteArray.length);
int charDoneIndex = charOffset + length;
while (charOffset < charDoneIndex) {
- int m = encodeISOArray(charArray, charOffset, byteArray, offset, length);
- charOffset += m;
- offset += m;
- if (m != length) {
+ int done = encodeIsoChars(charArray, charOffset, byteArray, byteOffset, length);
+ charOffset += done;
+ byteOffset += done;
+ if (done != length) {
char c = charArray.charAt(charOffset++);
if ((Character.isHighSurrogate(c)) && (charOffset < charDoneIndex)
&& (Character.isLowSurrogate(charArray.charAt(charOffset)))) {
@@ -169,11 +173,11 @@ public abstract class AbstractStringLayout extends AbstractLayout<String> {
}
charOffset++;
}
- byteArray[(offset++)] = '?';
- length = Math.min(charDoneIndex - charOffset, byteArray.length - offset);
+ byteArray[(byteOffset++)] = '?';
+ length = Math.min(charDoneIndex - charOffset, byteArray.length - byteOffset);
}
}
- return offset;
+ return byteOffset;
}
protected Charset getCharset() {