Better performance, messaging, and comments

chaaz · chaaz · commit 10108ba1a398 · 2019-01-16T14:57:24.000-07:00
diff --git a/src/main/java/com/mashape/unirest/http/Unirest.java b/src/main/java/com/mashape/unirest/http/Unirest.java
@@ -111,8 +111,8 @@ public static void setConcurrency(int maxTotal, int maxPerRoute) {
 	/**
 		* Set the max response size.
 		*
-		* @param maxTotal Defines the maximum response size for non-multipart responses. (Multipart responses, which include
-		*                 file downloads, will have no size limit).
+		* @param maxResponseSize Defines the maximum response size for non-multipart responses. (Multipart responses, which
+		*                        include file downloads, will have no size limit).
 		*/
 	public static void setMaxResponseSize(long maxResponseSize) {
 		Options.setOption(Option.MAX_RESPONSE_SIZE, maxResponseSize);
diff --git a/src/main/java/com/mashape/unirest/http/utils/ResponseUtils.java b/src/main/java/com/mashape/unirest/http/utils/ResponseUtils.java
@@ -57,20 +57,29 @@ public static boolean isMultipartContentType(Header contentType) {
 	}
 
 	public static void checkResponseSize(Long contentLength) throws IOException {
-		Number maxResponse = (Number) Options.getOption(Option.MAX_RESPONSE_SIZE);
-		if (maxResponse == null) {
+		checkMaxResponseSize(contentLength, getMaxResponseAsLong());
+	}
+
+	public static void checkMaxResponseSize(Long contentLength, long maxResponse) throws IOException {
+		if (contentLength == null) {
 			return;
 		}
-		long maxAsLong= maxResponse.longValue();
-		if (maxAsLong > -1 && maxAsLong < contentLength) {
-			throw new IOException("Declared response content too large: " + maxResponse + " > " + contentLength);
+		if (maxResponse > -1 && maxResponse < contentLength) {
+			throw new IOException("Response content too large: " + maxResponse + " < " + contentLength);
 		}
 	}
 
+	public static long getMaxResponseAsLong() {
+		Number maxResponse = (Number) Options.getOption(Option.MAX_RESPONSE_SIZE);
+		if (maxResponse == null) return -1;
+		return maxResponse.longValue();
+	}
+
 	public static byte[] getBytes(InputStream is, boolean checkSize) throws IOException {
 		int len;
 		int size = 1024;
 		byte[] buf;
+		checkSize = checkSize && Options.getOption(Option.MAX_RESPONSE_SIZE) != null;
 
 		if (is instanceof ByteArrayInputStream) {
 			size = is.available();
@@ -80,6 +89,7 @@ public static byte[] getBytes(InputStream is, boolean checkSize) throws IOExcept
 			buf = new byte[size];
 			len = is.read(buf, 0, size);
 		} else {
+			long maxResponse = getMaxResponseAsLong();
 			long total = 0;
 			ByteArrayOutputStream bos = new ByteArrayOutputStream();
 			buf = new byte[size];
@@ -88,7 +98,7 @@ public static byte[] getBytes(InputStream is, boolean checkSize) throws IOExcept
 			while ((len = is.read(buf, 0, size)) != -1) {
 				total += len;
 				if (checkSize) {
-					ResponseUtils.checkResponseSize(total);
+					ResponseUtils.checkMaxResponseSize(total, maxResponse);
 				}
 				bos.write(buf, 0, len);
 			}
diff --git a/src/test/java/com/mashape/unirest/test/http/UnirestTest.java b/src/test/java/com/mashape/unirest/test/http/UnirestTest.java
@@ -64,6 +64,7 @@ public class UnirestTest {
 	public void setUp() {
 		lock = new CountDownLatch(1);
 		status = false;
+		Options.setOption(Option.MAX_RESPONSE_SIZE, -1);
 	}
 
 	private String findAvailableIpAddress() throws UnknownHostException, IOException {

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ public class UnirestTest {`
`64`	`64`	`public void setUp() {`
`65`	`65`	`lock = new CountDownLatch(1);`
`66`	`66`	`status = false;`
	`67`	`+ Options.setOption(Option.MAX_RESPONSE_SIZE, -1);`
`67`	`68`	`}`
`68`	`69`
`69`	`70`	`private String findAvailableIpAddress() throws UnknownHostException, IOException {`