Author: maartenc
Date: Tue Dec 16 13:32:39 2008
New Revision: 727157
URL: http://svn.apache.org/viewvc?rev=727157&view=rev
Log:
FIX: Files with non-latin symbols fail to download (IVY-962) (merged from trunk)
Modified:
ant/ivy/core/branches/2.0.x/ (props changed)
ant/ivy/core/branches/2.0.x/CHANGES.txt
ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/util/url/AbstractURLHandler.java
Propchange: ant/ivy/core/branches/2.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Dec 16 13:32:39 2008
@@ -1,2 +1,2 @@
/ant/ivy/core/branches/2.0.0-rc2:707177-709027
-/ant/ivy/core/trunk:695737,696014-696031,696442,698318-706770,709027-709034,709039-710178,711197-718421,720060-720591,721305-723065
+/ant/ivy/core/trunk:695737,696014-696031,696442,698318-706770,709027-709034,709039-718421,720060-720591,721305-723065
Modified: ant/ivy/core/branches/2.0.x/CHANGES.txt
URL:
http://svn.apache.org/viewvc/ant/ivy/core/branches/2.0.x/CHANGES.txt?rev=727157&r1=727156&r2=727157&view=diff
==============================================================================
--- ant/ivy/core/branches/2.0.x/CHANGES.txt (original)
+++ ant/ivy/core/branches/2.0.x/CHANGES.txt Tue Dec 16 13:32:39 2008
@@ -91,6 +91,7 @@
- FIX: NullPointerException when resolving module wihout revision in the
pattern (IVY-980)
- FIX: IO problem while parsing ivy file (Resetting to invalid mark) (IVY-975)
- FIX: Cannot parse maven2 poms containing an UTF-8 BOM
+- FIX: Files with non-latin symbols fail to download (IVY-962)
2.0.0-rc2
=====================================
Modified:
ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/util/url/AbstractURLHandler.java
URL:
http://svn.apache.org/viewvc/ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/util/url/AbstractURLHandler.java?rev=727157&r1=727156&r2=727157&view=diff
==============================================================================
---
ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/util/url/AbstractURLHandler.java
(original)
+++
ant/ivy/core/branches/2.0.x/src/java/org/apache/ivy/util/url/AbstractURLHandler.java
Tue Dec 16 13:32:39 2008
@@ -97,7 +97,7 @@
// it is possible that the original url was already (partial)
escaped,
// so we must unescape all '%' followed by 2 hexadecimals...
- String uriString = uri.toString();
+ String uriString = uri.toASCIIString();
// manually escape the '+' character
uriString = uriString.replaceAll("\\+", "%2B");
