Author: maartenc Date: Mon Sep 29 15:47:12 2008 New Revision: 700296 URL: http://svn.apache.org/viewvc?rev=700296&view=rev Log: FIX: StackOverflow when using ivy:settings with "ivy.instance" as id (IVY-924)
Modified: ant/ivy/core/trunk/CHANGES.txt ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyAntSettings.java Modified: ant/ivy/core/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=700296&r1=700295&r2=700296&view=diff ============================================================================== --- ant/ivy/core/trunk/CHANGES.txt (original) +++ ant/ivy/core/trunk/CHANGES.txt Mon Sep 29 15:47:12 2008 @@ -89,6 +89,7 @@ - FIX: Properties needed to parse version in POM (IVY-914) (thanks to Tom Widmer) - FIX: build.xml: checkstyle + checkstyle-report dont work together (IVY-919) - FIX: Maven packaging of "pom" should add a "jar" artifact if present (IVY-920) +- FIX: StackOverflow when using ivy:settings with "ivy.instance" as id (IVY-924) 2.0.0-rc1 ===================================== Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyAntSettings.java URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyAntSettings.java?rev=700296&r1=700295&r2=700296&view=diff ============================================================================== --- ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyAntSettings.java (original) +++ ant/ivy/core/trunk/src/java/org/apache/ivy/ant/IvyAntSettings.java Mon Sep 29 15:47:12 2008 @@ -178,7 +178,7 @@ public void setProject(Project p) { super.setProject(p); - if ("ivy.instance".equals(id) && getProject().getReference(id) == null) { + if ("ivy.instance".equals(id) && getProject().getReferences().get(id) == null) { // register ourselfs as default settings, just in case the id attribute is not set getProject().addReference("ivy.instance", this); autoRegistered = true;