From: Maria Odea B. Ching Date: Mon, 25 Feb 2008 07:38:31 +0000 (+0000) Subject: -merge changes from archiva-1.0.x branch -r630722 X-Git-Tag: archiva-r676265~346 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=79947feead7b500a49014df828e7fda28c97741a;p=archiva.git -merge changes from archiva-1.0.x branch -r630722 git-svn-id: https://svn.apache.org/repos/asf/maven/archiva/trunk@630750 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilter.java b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilter.java index 76225b8fd..24a22f90c 100644 --- a/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilter.java +++ b/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilter.java @@ -111,10 +111,15 @@ public class EffectiveProjectModelFilter // 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.