svn commit: r1373340 - in /ant/ivy/core/trunk: CHANGES.txt src/java/org/apache/ivy/ant/IvyBuildNumber.java src/java/org/apache/ivy/ant/IvyFindRevision.java

[hibou]

Author: hibou
Date: Wed Aug 15 11:33:32 2012
New Revision: 1373340

URL: http://svn.apache.org/viewvc?rev=1373340&view=rev
Log:
IVY-1344: fix setting the branch attribute (Thanks to Ales Nosek)

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

Modified: ant/ivy/core/trunk/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=1373340&r1=1373339&r2=1373340&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Wed Aug 15 11:33:32 2012
@@ -83,6 +83,7 @@ for detailed view of each issue, please 
        Stephen Nesbitt
        Joshua Nichols
        Bernard Niset
+       Ales Nosek
        David Maplesden
        Glen Marchesani
        Phil Messenger
@@ -134,6 +135,7 @@ for detailed view of each issue, please 
 - FIX: ivy.xml extends feature complains about Windows filesystem path 
(IVY-1359) (thanks to Mitch Gitman and Jean-Louis Boudart)
 - FIX: buildlist task chokes on absolute path to parent Ivy module (IVY-1364) 
(thanks to Mitch Gitman and Jean-Louis Boudart)
 - FIX: The ignore circular dependency strategy is clobbering the warn strategy 
(IVY-1353) (Thanks to Carl Quinn)
+- FIX: Buildnumber and IvyFindRevision Ant tasks should honour defaultBranch 
setting (IVY-1344) (Thanks to Ales Nosek)
 
 - NEW: Support Conditional Setting of a Property (IVY-1367)
 

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=1373340&r1=1373339&r2=1373340&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 Wed Aug 
15 11:33:32 2012
@@ -147,7 +147,7 @@ public class IvyBuildNumber extends IvyT
         Ivy ivy = getIvyInstance();
         IvySettings settings = ivy.getSettings();
         if (branch == null) {
-            settings.getDefaultBranch(new ModuleId(organisation, module));
+            branch = settings.getDefaultBranch(new ModuleId(organisation, 
module));
         }
         if (revision == null || revision.length() == 0) {
             revision = "latest.integration";

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyFindRevision.java
URL: 
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyFindRevision.java?rev=1373340&r1=1373339&r2=1373340&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyFindRevision.java 
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyFindRevision.java Wed Aug 
15 11:33:32 2012
@@ -93,7 +93,7 @@ public class IvyFindRevision extends Ivy
         Ivy ivy = getIvyInstance();
         IvySettings settings = ivy.getSettings();
         if (branch == null) {
-            settings.getDefaultBranch(new ModuleId(organisation, module));
+            branch = settings.getDefaultBranch(new ModuleId(organisation, 
module));
         }
         ResolvedModuleRevision rmr = 
ivy.findModule(ModuleRevisionId.newInstance(organisation,
             module, branch, revision));