ant-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hi...@apache.org
Subject [34/35] git commit: IVY-1493 : Can't resolve wildcard dependencies when remote artifact server does not set content-type header (Thanks to Andrew Bernhagen)
Date Tue, 28 Oct 2014 21:37:37 GMT
IVY-1493 : Can't resolve wildcard dependencies when remote artifact server does not set content-type
header (Thanks to Andrew Bernhagen)

Project: http://git-wip-us.apache.org/repos/asf/ant-ivy/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant-ivy/commit/b84f786d
Tree: http://git-wip-us.apache.org/repos/asf/ant-ivy/tree/b84f786d
Diff: http://git-wip-us.apache.org/repos/asf/ant-ivy/diff/b84f786d

Branch: refs/heads/2.4.x
Commit: b84f786db6d85cbf9973adfccdf135cb71824b87
Parents: 902a680
Author: Nicolas Lalevée <nicolas.lalevee@hibnet.org>
Authored: Tue Oct 28 00:37:04 2014 +0100
Committer: Nicolas Lalevée <nicolas.lalevee@hibnet.org>
Committed: Tue Oct 28 00:37:04 2014 +0100

----------------------------------------------------------------------
 CHANGES.txt                                           | 2 ++
 src/java/org/apache/ivy/util/url/ApacheURLLister.java | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b84f786d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 4d18a9d..da4a7ff 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -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
 =====================================

http://git-wip-us.apache.org/repos/asf/ant-ivy/blob/b84f786d/src/java/org/apache/ivy/util/url/ApacheURLLister.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/ivy/util/url/ApacheURLLister.java b/src/java/org/apache/ivy/util/url/ApacheURLLister.java
index 2df69b0..e2e7dea 100644
--- a/src/java/org/apache/ivy/util/url/ApacheURLLister.java
+++ b/src/java/org/apache/ivy/util/url/ApacheURLLister.java
@@ -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);
 


Mime
View raw message