ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maart...@apache.org
Subject svn commit: r1374922 - /ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java
Date Mon, 20 Aug 2012 06:17:40 GMT
Author: maartenc
Date: Mon Aug 20 06:17:40 2012
New Revision: 1374922

URL: http://svn.apache.org/viewvc?rev=1374922&view=rev
Log:
Attempt to fix problem with finding parent ivy.xml on unix.

Modified:
    ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java

Modified: ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java?rev=1374922&r1=1374921&r2=1374922&view=diff
==============================================================================
--- ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java
(original)
+++ ant/ivy/core/trunk/src/java/org/apache/ivy/plugins/parser/xml/XmlModuleDescriptorParser.java
Mon Aug 20 06:17:40 2012
@@ -59,7 +59,6 @@ import org.apache.ivy.core.resolve.Resol
 import org.apache.ivy.core.resolve.ResolveEngine;
 import org.apache.ivy.core.resolve.ResolveOptions;
 import org.apache.ivy.core.resolve.ResolvedModuleRevision;
-import org.apache.ivy.core.settings.IvySettings;
 import org.apache.ivy.plugins.conflict.ConflictManager;
 import org.apache.ivy.plugins.conflict.FixedConflictManager;
 import org.apache.ivy.plugins.matcher.PatternMatcher;
@@ -602,16 +601,17 @@ public class XmlModuleDescriptorParser e
                 return null;
             }
             
-            File file = FileUtil.normalize(location);
+            File file = new File(location);
             if (!file.isAbsolute()) {
                 URL url = new URL(descriptorURL, location);
                 try {
-                    file = FileUtil.normalize(new File(new URI(url.toExternalForm())).getAbsolutePath());
+                    file = new File(new URI(url.toExternalForm()));
                 } catch (URISyntaxException e) {
-                    file = FileUtil.normalize(new File(url.getPath()).getAbsolutePath());
+                    file = new File(url.getPath());
                 }
             }
-
+            
+            file = FileUtil.normalize(file.getAbsolutePath());
             if (!file.exists()) {
                 Message.verbose("Parent module doesn't exist on the filesystem: " + file.getAbsolutePath());
                 return null;



Mime
View raw message