You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2016/10/25 08:23:14 UTC
[1/2] logging-log4j2 git commit: LOG4J-1644 adding locking for
clearing registry
Repository: logging-log4j2
Updated Branches:
refs/heads/LOG4J2-1645 c9bdbb73d -> 32adca258
LOG4J-1644 adding locking for clearing registry
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/5620da72
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/5620da72
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/5620da72
Branch: refs/heads/LOG4J2-1645
Commit: 5620da7237b3b20755b97aefe49037c84095fc5c
Parents: 6ffcd1e
Author: Mikael St�ldal <mi...@magine.com>
Authored: Mon Oct 24 15:03:44 2016 +0200
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Mon Oct 24 15:03:44 2016 +0200
----------------------------------------------------------------------
.../org/apache/logging/log4j/spi/AbstractLoggerAdapter.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/5620da72/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLoggerAdapter.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLoggerAdapter.java b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLoggerAdapter.java
index 33c8745..a3eb31d 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLoggerAdapter.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/spi/AbstractLoggerAdapter.java
@@ -124,6 +124,11 @@ public abstract class AbstractLoggerAdapter<L> implements LoggerAdapter<L> {
@Override
public void close() {
- registry.clear();
+ lock.writeLock ().lock ();
+ try {
+ registry.clear();
+ } finally {
+ lock.writeLock ().unlock ();
+ }
}
}
[2/2] logging-log4j2 git commit: Merge branch 'master' into
LOG4J2-1645
Posted by mi...@apache.org.
Merge branch 'master' into LOG4J2-1645
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/32adca25
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/32adca25
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/32adca25
Branch: refs/heads/LOG4J2-1645
Commit: 32adca2582538661c22475b87dcd855cc24a1bd8
Parents: c9bdbb7 5620da7
Author: Mikael St�ldal <mi...@magine.com>
Authored: Tue Oct 25 10:22:57 2016 +0200
Committer: Mikael St�ldal <mi...@magine.com>
Committed: Tue Oct 25 10:22:57 2016 +0200
----------------------------------------------------------------------
.../org/apache/logging/log4j/spi/AbstractLoggerAdapter.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------