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 03:57:52 UTC

svn commit: r630722 - /maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilter.java

Author: oching
Date: Sun Feb 24 18:57:50 2008
New Revision: 630722

URL: http://svn.apache.org/viewvc?rev=630722&view=rev
Log:
[MRM-687]
applied patch submitted by Dario Oliveros

-do not add project into cache if it contains no groupId and version information (EffectiveProjectModelFilter)

Modified:
    maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilter.java

Modified: maven/archiva/branches/archiva-1.0.x/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/branches/archiva-1.0.x/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilter.java?rev=630722&r1=630721&r2=630722&view=diff
==============================================================================
--- maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilter.java (original)
+++ maven/archiva/branches/archiva-1.0.x/archiva-base/archiva-repository-layer/src/main/java/org/apache/maven/archiva/repository/project/filters/EffectiveProjectModelFilter.java Sun Feb 24 18:57:50 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.