natas_hw
/
ant-ivy
mirror of https://github.com/apache/ant-ivy
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

IVY-1493 : Can't resolve wildcard dependencies when remote artifact server does not set content-type header (Thanks to Andrew Bernhagen)

This commit is contained in:
Nicolas Lalevée 2014-10-28 00:37:04 +01:00
parent 902a680951
commit b84f786db6
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.txt
View File

@ -22,6 +22,7 @@ for detailed view of each issue, please consult http://issues.apache.org/jira/br
Andreas Axelsson
Stephane Bailliez
Karl Baum
Andrew Bernhagen
Mikkel Bjerg
Per Arnold Blaasmo
Jeffrey Blattman
@ -154,6 +155,7 @@ for detailed view of each issue, please consult http://issues.apache.org/jira/br
- FIX: failed to resolve dynamic revisions in some cases for URL repositories (IVY-1472)
- FIX: ClassCastException in Eclipse 4.4.1 (IVY-1487) (Thanks to Carsten Pfeiffer)
- FIX: NullPointerException when accessing charset to invalid URL (IVY-1452) (Thanks to Frédéric Riviere)
- FIX: Can't resolve wildcard dependencies when remote artifact server does not set content-type header (IVY-1493) (Thanks to Andrew Bernhagen)
2.4.0-rc1
=====================================

7
src/java/org/apache/ivy/util/url/ApacheURLLister.java
View File

@ -117,7 +117,12 @@ public class ApacheURLLister {
String charset = urlInfo.getBodyCharset();
InputStream contentStream = urlHandler.openStream(url);
BufferedReader r = new BufferedReader(new InputStreamReader(contentStream, charset));
BufferedReader r = null;
if (charset == null) {
r = new BufferedReader(new InputStreamReader(contentStream));
} else {
r = new BufferedReader(new InputStreamReader(contentStream, charset));
}
String htmlText = FileUtil.readEntirely(r);