Author: xavier
Date: Wed Oct 1 07:50:18 2008
New Revision: 700798
URL: http://svn.apache.org/viewvc?rev=700798&view=rev
Log:
FIX: NullPointerException in AbstractPatternsBasedResolver when organization is
null (IVY-928)
Modified:
ant/ivy/core/trunk/CHANGES.txt
ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/AbstractPatternsBasedResolver.java
Modified: ant/ivy/core/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=700798&r1=700797&r2=700798&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Wed Oct 1 07:50:18 2008
@@ -84,6 +84,7 @@
- IMPROVEMENT: Error messages on use of relative paths can be cyrptic (IVY-909)
- IMPROVEMENT: Maven accepts illegal XML for its pom's, Ivy not (IVY-921)
+- FIX: NullPointerException in AbstractPatternsBasedResolver when organization
is null (IVY-928)
- FIX: NullPointerException when Ivy cannot locate pom parent (IVY-927)
- FIX: Cannot configure items with java.io.File attributes (IVY-905)
- FIX: Environment properties in ivy settings are no longer resolved (IVY-907)
Modified:
ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/AbstractPatternsBasedResolver.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/AbstractPatternsBasedResolver.java?rev=700798&r1=700797&r2=700798&view=diff
==============================================================================
---
ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/AbstractPatternsBasedResolver.java
(original)
+++
ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/resolver/AbstractPatternsBasedResolver.java
Wed Oct 1 07:50:18 2008
@@ -438,7 +438,7 @@
}
protected ModuleRevisionId convertM2IdForResourceSearch(ModuleRevisionId
mrid) {
- if (mrid.getOrganisation().indexOf('.') == -1) {
+ if (mrid.getOrganisation() == null ||
mrid.getOrganisation().indexOf('.') == -1) {
return mrid;
}
return
ModuleRevisionId.newInstance(mrid.getOrganisation().replace('.', '/'),
