ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gscok...@apache.org
Subject svn commit: r602022 - in /ant/ivy/core/trunk: CHANGES.txt src/java/org/apache/ivy/plugins/namespace/Namespace.java
Date Fri, 07 Dec 2007 08:40:58 GMT
Author: gscokart
Date: Fri Dec  7 00:40:56 2007
New Revision: 602022

URL: http://svn.apache.org/viewvc?rev=602022&view=rev
Log:
FIX: NPE in namespace transformation during the ivy:findrevision and ivy:resolve task execution
(IVY-659) (thanks to Andrea Bernardo Ciddio)

Modified:
    ant/ivy/core/trunk/CHANGES.txt
    ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/namespace/Namespace.java

Modified: ant/ivy/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/CHANGES.txt?rev=602022&r1=602021&r2=602022&view=diff
==============================================================================
--- ant/ivy/core/trunk/CHANGES.txt (original)
+++ ant/ivy/core/trunk/CHANGES.txt Fri Dec  7 00:40:56 2007
@@ -19,6 +19,7 @@
 	Jim Bonanno
 	Matthieu Brouillard
 	Kristian Cibulskis
+	Andrea Bernardo Ciddio
 	Jacob Grydholt Jensen
 	Scott Goldstein
 	Pierre H├Ągnestrand
@@ -57,6 +58,7 @@
    version in SVN
 =====================================
 - FIX: Strict conflictmanager seems to not support dynamic revisions (IVY-474)
+- FIX: NPE in namespace transformation during the ivy:findrevision and ivy:resolve task execution
(IVY-659) (thanks to Andrea Bernardo Ciddio)
 
 
    2.0.0-beta1

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/namespace/Namespace.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/namespace/Namespace.java?rev=602022&r1=602021&r2=602022&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/namespace/Namespace.java (original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/namespace/Namespace.java Fri Dec  7
00:40:56 2007
@@ -37,6 +37,9 @@
 
     private NamespaceTransformer fromSystemTransformer = new NamespaceTransformer() {
         public ModuleRevisionId transform(ModuleRevisionId mrid) {
+            if (mrid == null) {
+                return null;
+            }
             for (Iterator iter = rules.iterator(); iter.hasNext();) {
                 NamespaceRule rule = (NamespaceRule) iter.next();
                 ModuleRevisionId nmrid = rule.getFromSystem().transform(mrid);
@@ -56,6 +59,9 @@
 
     private NamespaceTransformer toSystemTransformer = new NamespaceTransformer() {
         public ModuleRevisionId transform(ModuleRevisionId mrid) {
+            if (mrid == null) {
+                return null;
+            }
             for (Iterator iter = rules.iterator(); iter.hasNext();) {
                 NamespaceRule rule = (NamespaceRule) iter.next();
                 ModuleRevisionId nmrid = rule.getToSystem().transform(mrid);



Mime
View raw message