You are viewing a plain text version of this content. The canonical link for it is here.
Posted to log4j-dev@logging.apache.org by Gary Gregory <ga...@gmail.com> on 2016/02/18 18:30:39 UTC
Fwd: [2/2] logging-log4j2 git commit: LOG4J2-1255 javadoc fix
Hey, that's not a Javadoc fix ;-)
Gary
---------- Forwarded message ----------
From: <rp...@apache.org>
Date: Thu, Feb 18, 2016 at 7:18 AM
Subject: [2/2] logging-log4j2 git commit: LOG4J2-1255 javadoc fix
To: commits@logging.apache.org
LOG4J2-1255 javadoc fix
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit:
http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c58d5b15
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c58d5b15
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c58d5b15
Branch: refs/heads/master
Commit: c58d5b15117c8e75388320e939bbafabdde615de
Parents: bd8edc6
Author: rpopma <rp...@apache.org>
Authored: Fri Feb 19 00:13:18 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Fri Feb 19 00:13:18 2016 +0900
----------------------------------------------------------------------
.../org/apache/logging/log4j/perf/nogc/NoGcMessage.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c58d5b15/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessage.java
----------------------------------------------------------------------
diff --git
a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessage.java
b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessage.java
index af5d115..004111e 100644
---
a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessage.java
+++
b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessage.java
@@ -64,7 +64,7 @@ public class NoGcMessage implements Message {
for (int i = 0; i < message.length() - 1; i++) {
char c = message.charAt(i);
if (c == '{' && message.charAt(i + 1) == '}') {
- state.buffer.append(state.params[current++]);
+ append(state.params[current++], state.buffer);
i++;
} else {
state.buffer.append(c);
@@ -76,6 +76,14 @@ public class NoGcMessage implements Message {
}
}
+ private void append(Object param, StringBuilder buffer) {
+ if (param instanceof StringBuilder) {
+ buffer.append((StringBuilder) param);
+ } else {
+ buffer.append(param);
+ }
+ }
+
@Override
public String getFormattedMessage() {
return getState().buffer.toString(); // not called by NoGcLayout
--
E-Mail: garydgregory@gmail.com | ggregory@apache.org
Java Persistence with Hibernate, Second Edition
<http://www.manning.com/bauer3/>
JUnit in Action, Second Edition <http://www.manning.com/tahchiev/>
Spring Batch in Action <http://www.manning.com/templier/>
Blog: http://garygregory.wordpress.com
Home: http://garygregory.com/
Tweet! http://twitter.com/GaryGregory
Re: [2/2] logging-log4j2 git commit: LOG4J2-1255 javadoc fix
Posted by Remko Popma <re...@gmail.com>.
np. :-)
Sent from my iPhone
> On 2016/02/19, at 7:16, Gary Gregory <ga...@gmail.com> wrote:
>
> I was just having fun ;-)
>
>> On Thu, Feb 18, 2016 at 2:03 PM, Remko Popma <re...@gmail.com> wrote:
>> Yes, slip up. Sorry.
>>
>> Sent from my iPhone
>>
>>> On 2016/02/19, at 2:30, Gary Gregory <ga...@gmail.com> wrote:
>>>
>>> Hey, that's not a Javadoc fix ;-)
>>>
>>> Gary
>>>
>>> ---------- Forwarded message ----------
>>> From: <rp...@apache.org>
>>> Date: Thu, Feb 18, 2016 at 7:18 AM
>>> Subject: [2/2] logging-log4j2 git commit: LOG4J2-1255 javadoc fix
>>> To: commits@logging.apache.org
>>>
>>>
>>> LOG4J2-1255 javadoc fix
>>>
>>>
>>> Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
>>> Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c58d5b15
>>> Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c58d5b15
>>> Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c58d5b15
>>>
>>> Branch: refs/heads/master
>>> Commit: c58d5b15117c8e75388320e939bbafabdde615de
>>> Parents: bd8edc6
>>> Author: rpopma <rp...@apache.org>
>>> Authored: Fri Feb 19 00:13:18 2016 +0900
>>> Committer: rpopma <rp...@apache.org>
>>> Committed: Fri Feb 19 00:13:18 2016 +0900
>>>
>>> ----------------------------------------------------------------------
>>> .../org/apache/logging/log4j/perf/nogc/NoGcMessage.java | 10 +++++++++-
>>> 1 file changed, 9 insertions(+), 1 deletion(-)
>>> ----------------------------------------------------------------------
>>>
>>>
>>> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c58d5b15/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessage.java
>>> ----------------------------------------------------------------------
>>> diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessage.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessage.java
>>> index af5d115..004111e 100644
>>> --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessage.java
>>> +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessage.java
>>> @@ -64,7 +64,7 @@ public class NoGcMessage implements Message {
>>> for (int i = 0; i < message.length() - 1; i++) {
>>> char c = message.charAt(i);
>>> if (c == '{' && message.charAt(i + 1) == '}') {
>>> - state.buffer.append(state.params[current++]);
>>> + append(state.params[current++], state.buffer);
>>> i++;
>>> } else {
>>> state.buffer.append(c);
>>> @@ -76,6 +76,14 @@ public class NoGcMessage implements Message {
>>> }
>>> }
>>>
>>> + private void append(Object param, StringBuilder buffer) {
>>> + if (param instanceof StringBuilder) {
>>> + buffer.append((StringBuilder) param);
>>> + } else {
>>> + buffer.append(param);
>>> + }
>>> + }
>>> +
>>> @Override
>>> public String getFormattedMessage() {
>>> return getState().buffer.toString(); // not called by NoGcLayout
>>>
>>>
>>>
>>>
>>> --
>>> E-Mail: garydgregory@gmail.com | ggregory@apache.org
>>> Java Persistence with Hibernate, Second Edition
>>> JUnit in Action, Second Edition
>>> Spring Batch in Action
>>> Blog: http://garygregory.wordpress.com
>>> Home: http://garygregory.com/
>>> Tweet! http://twitter.com/GaryGregory
>
>
>
> --
> E-Mail: garydgregory@gmail.com | ggregory@apache.org
> Java Persistence with Hibernate, Second Edition
> JUnit in Action, Second Edition
> Spring Batch in Action
> Blog: http://garygregory.wordpress.com
> Home: http://garygregory.com/
> Tweet! http://twitter.com/GaryGregory
Re: [2/2] logging-log4j2 git commit: LOG4J2-1255 javadoc fix
Posted by Gary Gregory <ga...@gmail.com>.
I was just having fun ;-)
On Thu, Feb 18, 2016 at 2:03 PM, Remko Popma <re...@gmail.com> wrote:
> Yes, slip up. Sorry.
>
> Sent from my iPhone
>
> On 2016/02/19, at 2:30, Gary Gregory <ga...@gmail.com> wrote:
>
> Hey, that's not a Javadoc fix ;-)
>
> Gary
>
> ---------- Forwarded message ----------
> From: <rp...@apache.org>
> Date: Thu, Feb 18, 2016 at 7:18 AM
> Subject: [2/2] logging-log4j2 git commit: LOG4J2-1255 javadoc fix
> To: commits@logging.apache.org
>
>
> LOG4J2-1255 javadoc fix
>
>
> Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
> Commit:
> http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c58d5b15
> Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c58d5b15
> Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c58d5b15
>
> Branch: refs/heads/master
> Commit: c58d5b15117c8e75388320e939bbafabdde615de
> Parents: bd8edc6
> Author: rpopma <rp...@apache.org>
> Authored: Fri Feb 19 00:13:18 2016 +0900
> Committer: rpopma <rp...@apache.org>
> Committed: Fri Feb 19 00:13:18 2016 +0900
>
> ----------------------------------------------------------------------
> .../org/apache/logging/log4j/perf/nogc/NoGcMessage.java | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
> ----------------------------------------------------------------------
>
>
>
> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c58d5b15/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessage.java
> ----------------------------------------------------------------------
> diff --git
> a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessage.java
> b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessage.java
> index af5d115..004111e 100644
> ---
> a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessage.java
> +++
> b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessage.java
> @@ -64,7 +64,7 @@ public class NoGcMessage implements Message {
> for (int i = 0; i < message.length() - 1; i++) {
> char c = message.charAt(i);
> if (c == '{' && message.charAt(i + 1) == '}') {
> - state.buffer.append(state.params[current++]);
> + append(state.params[current++], state.buffer);
> i++;
> } else {
> state.buffer.append(c);
> @@ -76,6 +76,14 @@ public class NoGcMessage implements Message {
> }
> }
>
> + private void append(Object param, StringBuilder buffer) {
> + if (param instanceof StringBuilder) {
> + buffer.append((StringBuilder) param);
> + } else {
> + buffer.append(param);
> + }
> + }
> +
> @Override
> public String getFormattedMessage() {
> return getState().buffer.toString(); // not called by NoGcLayout
>
>
>
>
> --
> E-Mail: garydgregory@gmail.com | ggregory@apache.org
> Java Persistence with Hibernate, Second Edition
> <http://www.manning.com/bauer3/>
> JUnit in Action, Second Edition <http://www.manning.com/tahchiev/>
> Spring Batch in Action <http://www.manning.com/templier/>
> Blog: http://garygregory.wordpress.com
> Home: http://garygregory.com/
> Tweet! http://twitter.com/GaryGregory
>
>
--
E-Mail: garydgregory@gmail.com | ggregory@apache.org
Java Persistence with Hibernate, Second Edition
<http://www.manning.com/bauer3/>
JUnit in Action, Second Edition <http://www.manning.com/tahchiev/>
Spring Batch in Action <http://www.manning.com/templier/>
Blog: http://garygregory.wordpress.com
Home: http://garygregory.com/
Tweet! http://twitter.com/GaryGregory
Re: [2/2] logging-log4j2 git commit: LOG4J2-1255 javadoc fix
Posted by Remko Popma <re...@gmail.com>.
Yes, slip up. Sorry.
Sent from my iPhone
> On 2016/02/19, at 2:30, Gary Gregory <ga...@gmail.com> wrote:
>
> Hey, that's not a Javadoc fix ;-)
>
> Gary
>
> ---------- Forwarded message ----------
> From: <rp...@apache.org>
> Date: Thu, Feb 18, 2016 at 7:18 AM
> Subject: [2/2] logging-log4j2 git commit: LOG4J2-1255 javadoc fix
> To: commits@logging.apache.org
>
>
> LOG4J2-1255 javadoc fix
>
>
> Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
> Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c58d5b15
> Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c58d5b15
> Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c58d5b15
>
> Branch: refs/heads/master
> Commit: c58d5b15117c8e75388320e939bbafabdde615de
> Parents: bd8edc6
> Author: rpopma <rp...@apache.org>
> Authored: Fri Feb 19 00:13:18 2016 +0900
> Committer: rpopma <rp...@apache.org>
> Committed: Fri Feb 19 00:13:18 2016 +0900
>
> ----------------------------------------------------------------------
> .../org/apache/logging/log4j/perf/nogc/NoGcMessage.java | 10 +++++++++-
> 1 file changed, 9 insertions(+), 1 deletion(-)
> ----------------------------------------------------------------------
>
>
> http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c58d5b15/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessage.java
> ----------------------------------------------------------------------
> diff --git a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessage.java b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessage.java
> index af5d115..004111e 100644
> --- a/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessage.java
> +++ b/log4j-perf/src/main/java/org/apache/logging/log4j/perf/nogc/NoGcMessage.java
> @@ -64,7 +64,7 @@ public class NoGcMessage implements Message {
> for (int i = 0; i < message.length() - 1; i++) {
> char c = message.charAt(i);
> if (c == '{' && message.charAt(i + 1) == '}') {
> - state.buffer.append(state.params[current++]);
> + append(state.params[current++], state.buffer);
> i++;
> } else {
> state.buffer.append(c);
> @@ -76,6 +76,14 @@ public class NoGcMessage implements Message {
> }
> }
>
> + private void append(Object param, StringBuilder buffer) {
> + if (param instanceof StringBuilder) {
> + buffer.append((StringBuilder) param);
> + } else {
> + buffer.append(param);
> + }
> + }
> +
> @Override
> public String getFormattedMessage() {
> return getState().buffer.toString(); // not called by NoGcLayout
>
>
>
>
> --
> E-Mail: garydgregory@gmail.com | ggregory@apache.org
> Java Persistence with Hibernate, Second Edition
> JUnit in Action, Second Edition
> Spring Batch in Action
> Blog: http://garygregory.wordpress.com
> Home: http://garygregory.com/
> Tweet! http://twitter.com/GaryGregory