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 2016/09/14 15:20:38 UTC
logging-log4j2 git commit: LOG4J2-1447 ArrayContextData.putAll should
return immediately if parameter == this
Repository: logging-log4j2
Updated Branches:
refs/heads/master 54684e6bb -> 8e01b825a
LOG4J2-1447 ArrayContextData.putAll should return immediately if parameter == this
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8e01b825
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8e01b825
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8e01b825
Branch: refs/heads/master
Commit: 8e01b825a8b3f8a0aa9d4c54e96ac05ab89b8758
Parents: 54684e6
Author: rpopma <rp...@apache.org>
Authored: Thu Sep 15 00:20:43 2016 +0900
Committer: rpopma <rp...@apache.org>
Committed: Thu Sep 15 00:20:43 2016 +0900
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/util/ArrayContextData.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8e01b825/log4j-api/src/main/java/org/apache/logging/log4j/util/ArrayContextData.java
----------------------------------------------------------------------
diff --git a/log4j-api/src/main/java/org/apache/logging/log4j/util/ArrayContextData.java b/log4j-api/src/main/java/org/apache/logging/log4j/util/ArrayContextData.java
index 6dc5672..98508a3 100644
--- a/log4j-api/src/main/java/org/apache/logging/log4j/util/ArrayContextData.java
+++ b/log4j-api/src/main/java/org/apache/logging/log4j/util/ArrayContextData.java
@@ -218,15 +218,15 @@ public class ArrayContextData implements MutableContextData {
@Override
public void putAll(final ContextData source) {
+ if (source == this) {
+ return; // this.putAll(this) does not modify this collection
+ }
assertNotFrozen();
assertNoConcurrentModification();
if (source instanceof ArrayContextData && this.size == 0) {
initFrom0((ArrayContextData) source);
} else if (source != null) {
- if (source == this) {
- return; // this.putAll(this) does not modify this collection
- }
source.forEach(PUT_ALL, this);
}
}