It's all good, easy to revert ;-) On Oct 17, 2017 10:57, "Remko Popma" <remko.po...@gmail.com> wrote:
> My bad. > > On Wed, Oct 18, 2017 at 12:22 AM, <ggreg...@apache.org> wrote: > > > Repository: logging-log4j2 > > Updated Branches: > > refs/heads/master ff5e664cd -> 247c91d01 > > > > > > Revert "LOG4J2-2060 AbstractDatabaseManager should make a copy of > > LogEvents before holding references to them: AsyncLogger log events are > > mutable" > > > > This reverts commit 334667c7acc2955e157572bfa3b8d0272a8f1495. > > > > > > Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo > > Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/ > > commit/ecc2d35a > > Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ > ecc2d35a > > Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ > ecc2d35a > > > > Branch: refs/heads/master > > Commit: ecc2d35a4d3a90327d8a490edbd00ec8bfaeaea3 > > Parents: ff5e664 > > Author: Gary Gregory <ggreg...@apache.org> > > Authored: Tue Oct 17 08:43:25 2017 -0600 > > Committer: Gary Gregory <ggreg...@apache.org> > > Committed: Tue Oct 17 08:43:25 2017 -0600 > > > > ---------------------------------------------------------------------- > > .../logging/log4j/core/appender/db/AbstractDatabaseManager.java | 2 > +- > > src/changes/changes.xml | 3 > --- > > 2 files changed, 1 insertion(+), 4 deletions(-) > > ---------------------------------------------------------------------- > > > > > > http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ > > ecc2d35a/log4j-core/src/main/java/org/apache/logging/log4j/ > > core/appender/db/AbstractDatabaseManager.java > > ---------------------------------------------------------------------- > > diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/ > > appender/db/AbstractDatabaseManager.java b/log4j-core/src/main/java/ > > org/apache/logging/log4j/core/appender/db/AbstractDatabaseManager.java > > index b8b9899..c36c4d8 100644 > > --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/ > appender/db/ > > AbstractDatabaseManager.java > > +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/ > appender/db/ > > AbstractDatabaseManager.java > > @@ -162,7 +162,7 @@ public abstract class AbstractDatabaseManager extends > > AbstractManager implements > > */ > > public final synchronized void write(final LogEvent event) { > > if (this.bufferSize > 0) { > > - this.buffer.add(event.toImmutable()); > > + this.buffer.add(event); > > if (this.buffer.size() >= this.bufferSize || > > event.isEndOfBatch()) { > > this.flush(); > > } > > > > http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/ > > ecc2d35a/src/changes/changes.xml > > ---------------------------------------------------------------------- > > diff --git a/src/changes/changes.xml b/src/changes/changes.xml > > index 73d42ea..6dcb09e 100644 > > --- a/src/changes/changes.xml > > +++ b/src/changes/changes.xml > > @@ -59,9 +59,6 @@ > > <action issue="LOG4J2-2052" dev="rpopma" type="update"> > > Disable thread name caching by default when running on Java > 8u102 > > or later. > > </action> > > - <action issue="LOG4J2-2060" dev="rpopma" type="fix"> > > - AbstractDatabaseManager should make a copy of LogEvents before > > holding references to them: AsyncLogger log events are mutable. > > - </action> > > <action issue="LOG4J2-2055" dev="rgoers" type="fix"> > > If Log4j is used as the Tomcat logging implementation startup > > might fail if an application also uses Log4j. > > </action> > > > > >
