You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rp...@apache.org on 2015/09/13 08:52:46 UTC
logging-log4j2 git commit: LOG4J2-1120 avoid acquiring lock
unnecessarily
Repository: logging-log4j2
Updated Branches:
refs/heads/master ec611cb6a -> 6b2cbc2db
LOG4J2-1120 avoid acquiring lock unnecessarily
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/6b2cbc2d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6b2cbc2d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6b2cbc2d
Branch: refs/heads/master
Commit: 6b2cbc2dbd6b1e6e8856d003ffd5d7bfde815cc3
Parents: ec611cb
Author: rpopma <rp...@apache.org>
Authored: Sun Sep 13 15:52:45 2015 +0900
Committer: rpopma <rp...@apache.org>
Committed: Sun Sep 13 15:52:45 2015 +0900
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/config/LoggerConfig.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6b2cbc2d/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
index b020cd8..0472ab6 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/LoggerConfig.java
@@ -415,7 +415,7 @@ public class LoggerConfig extends AbstractFilterable {
}
private void afterLogEvent() {
- if (counter.decrementAndGet() == 0) {
+ if (counter.decrementAndGet() == 0 && shutdown.get()) {
signalCompletionIfShutdown();
}
}
@@ -424,9 +424,7 @@ public class LoggerConfig extends AbstractFilterable {
final Lock lock = shutdownLock;
lock.lock();
try {
- if (shutdown.get()) {
- noLogEvents.signalAll();
- }
+ noLogEvents.signalAll();
} finally {
lock.unlock();
}