You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by hi...@apache.org on 2012/10/15 17:32:08 UTC
svn commit: r1398339 - in /ant/ivy/core/branches/2.3.x: ./
src/java/org/apache/ivy/util/url/BasicURLHandler.java
Author: hibou
Date: Mon Oct 15 15:32:08 2012
New Revision: 1398339
URL: http://svn.apache.org/viewvc?rev=1398339&view=rev
Log:
merge of r1398334:
fix NPE: some server seems to not return any content type
Modified:
ant/ivy/core/branches/2.3.x/ (props changed)
ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/util/url/BasicURLHandler.java
Propchange: ant/ivy/core/branches/2.3.x/
------------------------------------------------------------------------------
Merged /ant/ivy/core/trunk:r1398334
Modified: ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/util/url/BasicURLHandler.java
URL: http://svn.apache.org/viewvc/ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/util/url/BasicURLHandler.java?rev=1398339&r1=1398338&r2=1398339&view=diff
==============================================================================
--- ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/util/url/BasicURLHandler.java (original)
+++ ant/ivy/core/branches/2.3.x/src/java/org/apache/ivy/util/url/BasicURLHandler.java Mon Oct 15 15:32:08 2012
@@ -108,11 +108,13 @@ public class BasicURLHandler extends Abs
String charSet = null;
- String[] elements = contentType.split(";");
- for (int i = 0; i < elements.length; i++) {
- String element = elements[i].trim();
- if (element.toLowerCase().startsWith("charset=")) {
- charSet = element.substring("charset=".length());
+ if (contentType != null) {
+ String[] elements = contentType.split(";");
+ for (int i = 0; i < elements.length; i++) {
+ String element = elements[i].trim();
+ if (element.toLowerCase().startsWith("charset=")) {
+ charSet = element.substring("charset=".length());
+ }
}
}