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

[markh]

Author: markh
Date: Thu Jun 21 02:23:20 2007
New Revision: 549438

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

Only log omit-for-nearer debug message if versions differ - required after 
removing restriction from DefaultArtifactCollector in r548797.

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

Modified: 
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
URL: 
http://svn.apache.org/viewvc/maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java?view=diff&rev=549438&r1=549437&r2=549438
==============================================================================
--- 
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
 (original)
+++ 
maven/components/trunk/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/DebugResolutionListener.java
 Thu Jun 21 02:23:20 2007
@@ -67,7 +67,13 @@
 
     public void omitForNearer( Artifact omitted, Artifact kept )
     {
-        logger.debug( indent + omitted + " (removed - nearer found: " + 
kept.getVersion() + ")" );
+        String omittedVersion = omitted.getVersion();
+        String keptVersion = kept.getVersion();
+
+        if ( omittedVersion != null ? !omittedVersion.equals( keptVersion ) : 
keptVersion != null )
+        {
+            logger.debug( indent + omitted + " (removed - nearer found: " + 
kept.getVersion() + ")" );
+        }
     }
 
     public void omitForCycle( Artifact omitted )