Fix charset computation when it's not specified in contentType

Stephane Landelle · Stephane Landelle · commit 27e60537d8b0 · 2012-12-18T10:58:40.000+01:00
diff --git a/src/main/java/com/ning/http/client/providers/apache/ApacheResponse.java b/src/main/java/com/ning/http/client/providers/apache/ApacheResponse.java
@@ -104,14 +104,12 @@ public String getResponseBodyExcerpt(int maxLength, String charset) throws IOExc
     }
     
     private String computeCharset(String charset) {
-    	String contentType = getContentType();
         if (charset == null) {
+        	String contentType = getContentType();
         	if (contentType != null)
-        		charset = AsyncHttpProviderUtils.parseCharset(contentType);
-        	else
-        		charset = DEFAULT_CHARSET;
+        		charset = AsyncHttpProviderUtils.parseCharset(contentType); // parseCharset can return null
         }
-        return charset;
+        return charset != null? charset: DEFAULT_CHARSET;
     }
 
     /* @Override */
diff --git a/src/main/java/com/ning/http/client/providers/jdk/JDKResponse.java b/src/main/java/com/ning/http/client/providers/jdk/JDKResponse.java
@@ -117,14 +117,12 @@ public String getResponseBodyExcerpt(int maxLength, String charset) throws IOExc
     }
     
     private String computeCharset(String charset) {
-    	String contentType = getContentType();
         if (charset == null) {
+        	String contentType = getContentType();
         	if (contentType != null)
-        		charset = AsyncHttpProviderUtils.parseCharset(contentType);
-        	else
-        		charset = DEFAULT_CHARSET;
+        		charset = AsyncHttpProviderUtils.parseCharset(contentType); // parseCharset can return null
         }
-        return charset;
+        return charset != null? charset: DEFAULT_CHARSET;
     }
 
     /* @Override */
diff --git a/src/main/java/com/ning/http/client/providers/netty/NettyResponse.java b/src/main/java/com/ning/http/client/providers/netty/NettyResponse.java
@@ -111,14 +111,12 @@ public String getResponseBodyExcerpt(int maxLength, String charset) throws IOExc
     }
     
     private String computeCharset(String charset) {
-    	String contentType = getContentType();
         if (charset == null) {
+        	String contentType = getContentType();
         	if (contentType != null)
-        		charset = AsyncHttpProviderUtils.parseCharset(contentType);
-        	else
-        		charset = DEFAULT_CHARSET;
+        		charset = AsyncHttpProviderUtils.parseCharset(contentType); // parseCharset can return null
         }
-        return charset;
+        return charset != null? charset: DEFAULT_CHARSET;
     }
 
     /* @Override */

Original file line number	Diff line number	Diff line change
`@@ -104,14 +104,12 @@ public String getResponseBodyExcerpt(int maxLength, String charset) throws IOExc`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`private String computeCharset(String charset) {`
`107`		`- String contentType = getContentType();`
`108`	`107`	`if (charset == null) {`
	`108`	`+ String contentType = getContentType();`
`109`	`109`	`if (contentType != null)`
`110`		`- charset = AsyncHttpProviderUtils.parseCharset(contentType);`
`111`		`- else`
`112`		`- charset = DEFAULT_CHARSET;`
	`110`	`+ charset = AsyncHttpProviderUtils.parseCharset(contentType); // parseCharset can return null`
`113`	`111`	`}`
`114`		`- return charset;`
	`112`	`+ return charset != null? charset: DEFAULT_CHARSET;`
`115`	`113`	`}`
`116`	`114`
`117`	`115`	`/* @Override */`
Original file line number	Diff line number	Diff line change
`@@ -117,14 +117,12 @@ public String getResponseBodyExcerpt(int maxLength, String charset) throws IOExc`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`private String computeCharset(String charset) {`
`120`		`- String contentType = getContentType();`
`121`	`120`	`if (charset == null) {`
	`121`	`+ String contentType = getContentType();`
`122`	`122`	`if (contentType != null)`
`123`		`- charset = AsyncHttpProviderUtils.parseCharset(contentType);`
`124`		`- else`
`125`		`- charset = DEFAULT_CHARSET;`
	`123`	`+ charset = AsyncHttpProviderUtils.parseCharset(contentType); // parseCharset can return null`
`126`	`124`	`}`
`127`		`- return charset;`
	`125`	`+ return charset != null? charset: DEFAULT_CHARSET;`
`128`	`126`	`}`
`129`	`127`
`130`	`128`	`/* @Override */`
Original file line number	Diff line number	Diff line change
`@@ -111,14 +111,12 @@ public String getResponseBodyExcerpt(int maxLength, String charset) throws IOExc`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`private String computeCharset(String charset) {`
`114`		`- String contentType = getContentType();`
`115`	`114`	`if (charset == null) {`
	`115`	`+ String contentType = getContentType();`
`116`	`116`	`if (contentType != null)`
`117`		`- charset = AsyncHttpProviderUtils.parseCharset(contentType);`
`118`		`- else`
`119`		`- charset = DEFAULT_CHARSET;`
	`117`	`+ charset = AsyncHttpProviderUtils.parseCharset(contentType); // parseCharset can return null`
`120`	`118`	`}`
`121`		`- return charset;`
	`119`	`+ return charset != null? charset: DEFAULT_CHARSET;`
`122`	`120`	`}`
`123`	`121`
`124`	`122`	`/* @Override */`