Skip to content
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

Jump to bottom

Fix livelock from concurrent use of HashMap #159

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix livelock from concurrent use of HashMap #159

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions src/main/groovy/nl/javadude/gradle/plugins/license/maven/AbstractLicenseMojo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.concurrent.CompletionService;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorCompletionService;
import java.util.concurrent.ExecutorService;
Expand Down Expand Up @@ -187,8 +187,8 @@ public void run() {
* From com/google/code/mojo/license/AbstractLicenseMojo.java
*/
protected final Map<String, String> mergeProperties() {
// first put syste environment
Map<String, String> props = new HashMap<String, String>(System.getenv());
// first put system environment
Map<String, String> props = new ConcurrentHashMap<String, String>(System.getenv());

// Override with extension
props.putAll(initial);
Expand All @@ -201,8 +201,8 @@ protected final Map<String, String> mergeProperties() {
}

private Map<String, String> buildMapping(Map<String,HeaderDefinition> headerDefinitions) {
Map<String, String> extensionMapping = useDefaultMappings ? new HashMap<String, String>(defaultMapping())
: new HashMap<String, String>();
Map<String, String> extensionMapping = useDefaultMappings ? new ConcurrentHashMap<String, String>(defaultMapping())
: new ConcurrentHashMap<String, String>();

List<HeaderType> headerTypes = Arrays.asList(HeaderType.values());
Set<String> validHeaderTypes = new HashSet<String>();
Expand All @@ -228,7 +228,7 @@ private Map<String, String> buildMapping(Map<String,HeaderDefinition> headerDefi

private Map<String, HeaderDefinition> buildHeaderDefinitions() {
// like mappings, first get default definitions
final Map<String, HeaderDefinition> headers = new HashMap<String, HeaderDefinition>(
final Map<String, HeaderDefinition> headers = new ConcurrentHashMap<String, HeaderDefinition>(
HeaderType.defaultDefinitions());

// Add additional header definitions
Expand Down