Author: mkleint
Date: Mon Nov 19 23:39:00 2007
New Revision: 596560

URL: http://svn.apache.org/viewvc?rev=596560&view=rev
Log:
use compareTo rather than equals on ArtifactVersion

Modified:
    
maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java
    
maven/shared/trunk/maven-toolchain/src/test/java/org/apache/maven/toolchain/RequirementMatcherFactoryTest.java

Modified: 
maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java?rev=596560&r1=596559&r2=596560&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java
 (original)
+++ 
maven/shared/trunk/maven-toolchain/src/main/java/org/apache/maven/toolchain/RequirementMatcherFactory.java
 Mon Nov 19 23:39:00 2007
@@ -80,7 +80,7 @@
                 if (range.hasRestrictions()) {
                     return range.containsVersion(version);
                 } else {
-                    return range.getRecommendedVersion().equals(version);
+                    return range.getRecommendedVersion().compareTo(version) == 
0;
                 }
             } 
             catch (InvalidVersionSpecificationException ex) 

Modified: 
maven/shared/trunk/maven-toolchain/src/test/java/org/apache/maven/toolchain/RequirementMatcherFactoryTest.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-toolchain/src/test/java/org/apache/maven/toolchain/RequirementMatcherFactoryTest.java?rev=596560&r1=596559&r2=596560&view=diff
==============================================================================
--- 
maven/shared/trunk/maven-toolchain/src/test/java/org/apache/maven/toolchain/RequirementMatcherFactoryTest.java
 (original)
+++ 
maven/shared/trunk/maven-toolchain/src/test/java/org/apache/maven/toolchain/RequirementMatcherFactoryTest.java
 Mon Nov 19 23:39:00 2007
@@ -50,6 +50,7 @@
         RequirementMatcher matcher;
         matcher = RequirementMatcherFactory.createVersionMatcher("1.5.2");
         assertFalse(matcher.matches("1.5"));
+        assertTrue(matcher.matches("1.5.2"));
         assertFalse(matcher.matches("[1.4,1.5)"));
         assertFalse(matcher.matches("[1.5,1.5.2)"));
         assertFalse(matcher.matches("(1.5.2,1.6)"));


Reply via email to