svn commit: r549510 - /maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java

[markh]

Author: markh
Date: Thu Jun 21 08:21:49 2007
New Revision: 549510

URL: http://svn.apache.org/viewvc?view=rev&rev=549510
Log:
Merged r549509 from 2.0.x:

Update OMIT_FOR_NEARER event to correctly reflect which node was actually 
omitted.

Modified:
    
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java

Modified: 
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java?view=diff&rev=549510&r1=549509&r2=549510
==============================================================================
--- 
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
 (original)
+++ 
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DefaultArtifactCollector.java
 Thu Jun 21 08:21:49 2007
@@ -229,12 +229,13 @@
                         // if we need to update scope of nearest to use 
farthest scope, use the nearest version, but farthest scope
                         nearest.disable();
                         farthest.getArtifact().setVersion( 
nearest.getArtifact().getVersion() );
+                        fireEvent( ResolutionListener.OMIT_FOR_NEARER, 
listeners, nearest, farthest.getArtifact() );
                     }
                     else
                     {
                         farthest.disable();
+                        fireEvent( ResolutionListener.OMIT_FOR_NEARER, 
listeners, farthest, nearest.getArtifact() );
                     }
-                    fireEvent( ResolutionListener.OMIT_FOR_NEARER, listeners, 
farthest, nearest.getArtifact() );
                 }
             }
         }