Apache/maven
1
0
Fork 0
mirror of https://github.com/apache/maven.git synced 2025-02-07 02:29:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MNG-4542] StringSearchModelInterpolator concurrency problem

Browse Source 
Replaced WeakHashmap + synchronized with a ConcurrentHashMap. This was done after observing no change in memory profile
after running all the IT's in the maven embedder with and without this patch. Discussed change with original author
of code.

git-svn-id: https://svn.apache.org/repos/asf/maven/maven-3/trunk@902473 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Kristian Rosenvold 2010-01-23 20:04:29 +00:00
parent 2bfc975ff1
commit f2c08ee302
1 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
maven-model-builder/src/main/java/org/apache/maven/model/interpolation/StringSearchModelInterpolator.java
View File

@ -21,8 +21,8 @@
import org.apache.maven.model.Model;
import org.apache.maven.model.building.ModelBuildingRequest;
import org.apache.maven.model.building.ModelProblemCollector;
import org.apache.maven.model.building.ModelProblem.Severity;
import org.apache.maven.model.building.ModelProblemCollector;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.interpolation.InterpolationPostProcessor;
import org.codehaus.plexus.interpolation.Interpolator;
@ -35,20 +35,18 @@
import java.lang.reflect.Modifier;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.WeakHashMap;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
@Component( role = ModelInterpolator.class )
public class StringSearchModelInterpolator
extends AbstractStringBasedModelInterpolator
{
private static final Map<Class<?>, Field[]> fieldsByClass = new WeakHashMap<Class<?>, Field[]>();
private static final Map<Class<?>, Boolean> fieldIsPrimitiveByClass = new WeakHashMap<Class<?>, Boolean>();
private static final Map<Class<?>, Field[]> fieldsByClass =
new ConcurrentHashMap<Class<?>, Field[]>(80, 0.75f, 2); // Empirical data from 3.x, actual =40
private static final Map<Class<?>, Boolean> fieldIsPrimitiveByClass =
new ConcurrentHashMap<Class<?>, Boolean>(62, 0.75f, 2); // Empirical data from 3.x, actual 31
public Model interpolateModel( Model model, File projectDir, ModelBuildingRequest config,
ModelProblemCollector problems )
@ -305,15 +303,11 @@ else if ( Map.class.isAssignableFrom( type ) )
}
private Field[] getFields(Class<?> cls) {
Field[] fields;
synchronized(fieldsByClass)
Field[] fields = fieldsByClass.get(cls);
if ( fields == null )
{
fields = fieldsByClass.get( cls );
if ( fields == null )
{
fields = cls.getDeclaredFields();
fieldsByClass.put( cls, fields );
}
fields = cls.getDeclaredFields();
fieldsByClass.put( cls, fields );
}
return fields;
}
@ -325,16 +319,13 @@ private boolean isQualifiedForInterpolation( Class<?> cls )
private boolean isQualifiedForInterpolation( Field field, Class<?> fieldType )
{
Boolean primitive;
synchronized ( fieldIsPrimitiveByClass)
Boolean primitive = fieldIsPrimitiveByClass.get(fieldType);
if ( primitive == null )
{
primitive = fieldIsPrimitiveByClass.get( fieldType );
if ( primitive == null )
{
primitive = fieldType.isPrimitive();
fieldIsPrimitiveByClass.put( fieldType, primitive );
}
primitive = fieldType.isPrimitive();
fieldIsPrimitiveByClass.put( fieldType, primitive );
}
if ( primitive )
{
return false;