Skip to content

Performance optimization in CloseableThreadContext.closeMap() (#2292) #2296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 19, 2024
Merged

Performance optimization in CloseableThreadContext.closeMap() (#2292) #2296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3ab9e41
Performance optimization in CloseableThreadContext.closeMap() (#2292)
jengebr Feb 16, 2024
ef3ca43
Add missing `final` modifiers
vy Feb 19, 2024
8845296
Adding changelog entry
jengebr Feb 19, 2024
e3b6fe2
Update readme.
vy Feb 19, 2024
666b60f
Moving changelog entry
jengebr Feb 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions log4j-api/src/main/java/org/apache/logging/log4j/CloseableThreadContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
*/
package org.apache.logging.log4j;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;

Expand Down Expand Up @@ -203,18 +203,22 @@ public void close() {
}

private void closeMap() {
for (final Iterator<Map.Entry<String, String>> it =
originalValues.entrySet().iterator();
it.hasNext(); ) {
final Map.Entry<String, String> entry = it.next();
final Map<String, String> valuesToReplace = new HashMap<>(originalValues.size());
final List<String> keysToRemove = new ArrayList<>(originalValues.size());
for (final Map.Entry<String, String> entry : originalValues.entrySet()) {
final String key = entry.getKey();
final String originalValue = entry.getValue();
if (null == originalValue) {
ThreadContext.remove(key);
keysToRemove.add(key);
} else {
ThreadContext.put(key, originalValue);
valuesToReplace.put(key, originalValue);
}
it.remove();
}
if (!valuesToReplace.isEmpty()) {
ThreadContext.putAll(valuesToReplace);
}
if (!keysToRemove.isEmpty()) {
ThreadContext.removeAll(keysToRemove);
}
}

Expand Down
8 changes: 8 additions & 0 deletions src/changelog/.2.x.x/improve_CloseableThreadContext_closeMap.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<entry xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns="http://logging.apache.org/log4j/changelog"
xsi:schemaLocation="http://logging.apache.org/log4j/changelog https://logging.apache.org/log4j/changelog-0.1.3.xsd"
type="changed">
<issue id="2296" link="https://github.com/apache/logging-log4j2/pull/2296"/>
<description format="asciidoc">Improve performance of `CloseableThreadContext#closeMap()`</description>
</entry>