Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MNG-4041] embedder returns stale maven project state 

Submitted by: Igor Fedorenko

o Applied extension to initial patch

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@782776 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Benjamin Bentmann 2009-06-08 20:43:06 +00:00
parent 76e9387f5d
commit 2ec6f400be
1 changed files with 10 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginCache.java
View File

@ -31,7 +31,6 @@ import org.apache.maven.model.Dependency;
import org.apache.maven.model.Exclusion; import org.apache.maven.model.Exclusion;
import org.apache.maven.model.ModelUtils; import org.apache.maven.model.ModelUtils;
import org.apache.maven.model.Plugin; import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginExecution;
import org.apache.maven.plugin.descriptor.PluginDescriptor; import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.codehaus.plexus.classworlds.realm.ClassRealm; import org.codehaus.plexus.classworlds.realm.ClassRealm;
import org.codehaus.plexus.component.annotations.Component; import org.codehaus.plexus.component.annotations.Component;
@ -44,7 +43,7 @@ public class DefaultPluginCache
implements PluginCache implements PluginCache
{ {
private static class CacheKey protected static class CacheKey
{ {
private final Plugin plugin; private final Plugin plugin;
@ -85,13 +84,13 @@ public class DefaultPluginCache
CacheKey other = (CacheKey) o; CacheKey other = (CacheKey) o;
return pluginEquals( plugin, other.plugin ); return pluginEquals( plugin, other.plugin ) && eq(repositories, other.repositories);
} }
} }
private final Map<CacheKey, PluginDescriptor> descriptorsCache = new HashMap<CacheKey, PluginDescriptor>(); protected final Map<CacheKey, PluginDescriptor> descriptorsCache = new HashMap<CacheKey, PluginDescriptor>();
private final Map<CacheKey, CacheRecord> cache = new HashMap<CacheKey, CacheRecord>(); protected final Map<CacheKey, CacheRecord> cache = new HashMap<CacheKey, CacheRecord>();
public CacheRecord get( Plugin plugin, ArtifactRepository localRepository, public CacheRecord get( Plugin plugin, ArtifactRepository localRepository,
List<ArtifactRepository> remoteRepositories ) List<ArtifactRepository> remoteRepositories )
@ -143,6 +142,12 @@ public class DefaultPluginCache
} }
CacheKey key = new CacheKey( plugin, localRepository, remoteRepositories ); CacheKey key = new CacheKey( plugin, localRepository, remoteRepositories );
if ( cache.containsKey( key ) )
{
throw new IllegalStateException( "Duplicate plugin realm for plugin " + plugin );
}
CacheRecord record = new CacheRecord( pluginRealm, pluginArtifacts ); CacheRecord record = new CacheRecord( pluginRealm, pluginArtifacts );
cache.put( key, record ); cache.put( key, record );
} }
@ -186,19 +191,6 @@ public class DefaultPluginCache
} }
} }
/*
* Must consider executions because each execution ends up as separate plexus component, with its own
* configuration, etc.
*/
for ( PluginExecution execution : plugin.getExecutions() )
{
hash = hash * 31 + execution.getId().hashCode();
hash = hash * 31 + ( execution.getInherited() != null ? execution.getInherited().hashCode() : 0 );
hash = hash * 31 + ( execution.getPhase() != null ? execution.getPhase().hashCode() : 0);
hash = hash * 31 + ( execution.getConfiguration() != null ? execution.getConfiguration().hashCode() : 0 );
hash = hash * 31 + execution.getGoals().hashCode();
}
return hash; return hash;
} }
@ -208,40 +200,9 @@ public class DefaultPluginCache
&& eq( a.getArtifactId(), b.getArtifactId() ) // && eq( a.getArtifactId(), b.getArtifactId() ) //
&& eq( a.getVersion(), b.getVersion() ) // && eq( a.getVersion(), b.getVersion() ) //
&& a.isExtensions() == b.isExtensions() // && a.isExtensions() == b.isExtensions() //
&& pluginExecutionsEquals( a.getExecutions(), b.getExecutions() ) //
&& dependenciesEquals( a.getDependencies(), b.getDependencies() ); && dependenciesEquals( a.getDependencies(), b.getDependencies() );
} }
protected static boolean pluginExecutionsEquals( List<PluginExecution> a, List<PluginExecution> b )
{
if ( a.size() != b.size() )
{
return false;
}
Iterator<PluginExecution> aI = a.iterator();
Iterator<PluginExecution> bI = b.iterator();
while ( aI.hasNext() )
{
PluginExecution aD = aI.next();
PluginExecution bD = bI.next();
boolean r = eq( aD.getId(), bD.getId() ) //
&& eq( aD.getInherited(), bD.getInherited() ) //
&& eq( aD.getPhase(), bD.getPhase() ) //
&& eq( aD.getConfiguration(), bD.getConfiguration() ) //
&& eq( aD.getGoals(), bD.getGoals() );
if ( !r )
{
return false;
}
}
return true;
}
private static boolean dependenciesEquals( List<Dependency> a, List<Dependency> b ) private static boolean dependenciesEquals( List<Dependency> a, List<Dependency> b )
{ {
if ( a.size() != b.size() ) if ( a.size() != b.size() )