svn commit: r786212 - /maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java

[bentmann]

Author: bentmann
Date: Thu Jun 18 19:19:32 2009
New Revision: 786212

URL: http://svn.apache.org/viewvc?rev=786212&view=rev
Log:
o Fixed artifact filtering

Modified:
    
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java

Modified: 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java?rev=786212&r1=786211&r2=786212&view=diff
==============================================================================
--- 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
 (original)
+++ 
maven/components/trunk/maven-core/src/main/java/org/apache/maven/project/MavenProject.java
 Thu Jun 18 19:19:32 2009
@@ -249,13 +249,13 @@
 
         for ( Dependency d : getDependencies() )
         {
-            Artifact dependencyArtifact = repositorySystem.createArtifact( 
d.getGroupId(), d.getArtifactId(), d.getVersion(), d.getScope(), d.getType() );
-            if ( filter != null )
+            Artifact dependencyArtifact =
+                repositorySystem.createArtifact( d.getGroupId(), 
d.getArtifactId(), d.getVersion(), d.getScope(),
+                                                 d.getType() );
+
+            if ( filter == null || filter.include( dependencyArtifact ) )
             {
-                if ( filter.include( dependencyArtifact ) )
-                {
-                    artifacts.add( dependencyArtifact );
-                }
+                artifacts.add( dependencyArtifact );
             }
         }