You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by oc...@apache.org on 2008/02/25 08:38:33 UTC
svn commit: r630750 -
/maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilter.java
Author: oching
Date: Sun Feb 24 23:38:31 2008
New Revision: 630750
URL: http://svn.apache.org/viewvc?rev=630750&view=rev
Log:
-merge changes from archiva-1.0.x branch -r630722
Modified:
maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilter.java
Modified: maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilter.java
URL: http://svn.apache.org/viewvc/maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilter.java?rev=630750&r1=630749&r2=630750&view=diff
==============================================================================
--- maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilter.java (original)
+++ maven/archiva/trunk/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilter.java Sun Feb 24 23:38:31 2008
@@ -111,10 +111,15 @@
// Resolve dependency versions from dependency management.
applyDependencyManagement( effectiveProject );
- synchronized ( effectiveProjectCache )
+ // Do not add project into cache if it contains no groupId and
+ // version information
+ if ( project.getGroupId() != null && project.getVersion() != null )
{
- DEBUG( "Putting (to cache/projectKey): " + projectKey );
- effectiveProjectCache.put( projectKey, effectiveProject );
+ synchronized ( effectiveProjectCache )
+ {
+ DEBUG( "Putting (to cache/projectKey): " + projectKey );
+ effectiveProjectCache.put( projectKey, effectiveProject );
+ }
}
// Return what we got.