ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maart...@apache.org
Subject svn commit: r820818 - in /ant/ivy/core/trunk: CHANGES.txt src/java/org/apache/ivy/ant/IvyBuildNumber.java
Date Thu, 01 Oct 2009 21:54:57 GMT
Author: maartenc
Date: Thu Oct  1 21:54:57 2009
New Revision: 820818

URL: http://svn.apache.org/viewvc?rev=820818&view=rev
Log:
FIX: IvyBuildNumber non-deterministic behaviour (IVY-1120)

Modified:
    ant/ivy/core/trunk/CHANGES.txt
    ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyBuildNumber.java

Modified: ant/ivy/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=820818&r1=820817&r2=820818&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Thu Oct  1 21:54:57 2009
@@ -94,6 +94,7 @@
 	
    trunk
 =====================================
+- FIX: IvyBuildNumber non-deterministic behaviour (IVY-1120)
 - FIX: Change spelling of 'occured' to 'occurred' (IVY-1123)
 - FIX: Ivy deliver fails to replace dynamic revision when using extra attributes (IVY-1111)
(thanks to Michael Scheetz)
 - FIX: IbiblioResolver not always correctly configured when using JRE 1.5 (IVY-1124) (thanks
to Flavio Coutinho da Costa)

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyBuildNumber.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyBuildNumber.java?rev=820818&r1=820817&r2=820818&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyBuildNumber.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyBuildNumber.java Thu Oct  1 21:54:57
2009
@@ -165,9 +165,9 @@
             private PatternMatcher regexp = new ExactOrRegexpPatternMatcher();
         
             public Matcher getMatcher(String expression) {
-                if ((expression == organisation)
-                        || (expression == module)
-                        || (expression == branch)) {
+                if (expression.equals(organisation)
+                        || expression.equals(module)
+                        || expression.equals(branch)) {
                     return exact.getMatcher(expression);
                 }
                 return regexp.getMatcher(expression);



Mime
View raw message