always set Content-Length header in case of method defines a meaning for an enclosed payload body.

kullfar · kullfar · commit 6e85a3bc7335 · 2019-07-30T15:14:08.000+03:00
diff --git a/scribejava-core/src/main/java/com/github/scribejava/core/httpclient/jdk/JDKHttpClient.java b/scribejava-core/src/main/java/com/github/scribejava/core/httpclient/jdk/JDKHttpClient.java
@@ -192,7 +192,10 @@ private static void addHeaders(HttpURLConnection connection, Map<String, String>
     private static void addBody(HttpURLConnection connection, byte[] content, boolean requiresBody) throws IOException {
         final int contentLength = content.length;
         if (requiresBody || contentLength > 0) {
-            prepareConnectionForBodyAndGetOutputStream(connection, contentLength).write(content);
+            final OutputStream outputStream = prepareConnectionForBodyAndGetOutputStream(connection, contentLength);
+            if (contentLength > 0) {
+                outputStream.write(content);
+            }
         }
     }
 
@@ -205,9 +208,10 @@ private static void addBody(HttpURLConnection connection, MultipartPayload multi
 
         if (requiresBody) {
             final ByteArrayOutputStream os = getPayload(multipartPayload);
-
-            if (os.size() > 0) {
-                os.writeTo(prepareConnectionForBodyAndGetOutputStream(connection, os.size()));
+            final int contentLength = os.size();
+            final OutputStream outputStream = prepareConnectionForBodyAndGetOutputStream(connection, contentLength);
+            if (contentLength > 0) {
+                os.writeTo(outputStream);
             }
         }
     }
@@ -261,8 +265,11 @@ private static OutputStream prepareConnectionForBodyAndGetOutputStream(HttpURLCo
         if (connection.getRequestProperty(CONTENT_TYPE) == null) {
             connection.setRequestProperty(CONTENT_TYPE, DEFAULT_CONTENT_TYPE);
         }
-        connection.setDoOutput(true);
-        return connection.getOutputStream();
+        if (contentLength > 0) {
+            connection.setDoOutput(true);
+            return connection.getOutputStream();
+        } else {
+            return null;
+        }
     }
-
 }

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,10 @@ private static void addHeaders(HttpURLConnection connection, Map<String, String>`
`192`	`192`	`private static void addBody(HttpURLConnection connection, byte[] content, boolean requiresBody) throws IOException {`
`193`	`193`	`final int contentLength = content.length;`
`194`	`194`	`if (requiresBody \|\| contentLength > 0) {`
`195`		`- prepareConnectionForBodyAndGetOutputStream(connection, contentLength).write(content);`
	`195`	`+ final OutputStream outputStream = prepareConnectionForBodyAndGetOutputStream(connection, contentLength);`
	`196`	`+ if (contentLength > 0) {`
	`197`	`+ outputStream.write(content);`
	`198`	`+ }`
`196`	`199`	`}`
`197`	`200`	`}`
`198`	`201`
`@@ -205,9 +208,10 @@ private static void addBody(HttpURLConnection connection, MultipartPayload multi`
`205`	`208`
`206`	`209`	`if (requiresBody) {`
`207`	`210`	`final ByteArrayOutputStream os = getPayload(multipartPayload);`
`208`		`-`
`209`		`- if (os.size() > 0) {`
`210`		`- os.writeTo(prepareConnectionForBodyAndGetOutputStream(connection, os.size()));`
	`211`	`+ final int contentLength = os.size();`
	`212`	`+ final OutputStream outputStream = prepareConnectionForBodyAndGetOutputStream(connection, contentLength);`
	`213`	`+ if (contentLength > 0) {`
	`214`	`+ os.writeTo(outputStream);`
`211`	`215`	`}`
`212`	`216`	`}`
`213`	`217`	`}`
`@@ -261,8 +265,11 @@ private static OutputStream prepareConnectionForBodyAndGetOutputStream(HttpURLCo`
`261`	`265`	`if (connection.getRequestProperty(CONTENT_TYPE) == null) {`
`262`	`266`	`connection.setRequestProperty(CONTENT_TYPE, DEFAULT_CONTENT_TYPE);`
`263`	`267`	`}`
`264`		`- connection.setDoOutput(true);`
`265`		`- return connection.getOutputStream();`
	`268`	`+ if (contentLength > 0) {`
	`269`	`+ connection.setDoOutput(true);`
	`270`	`+ return connection.getOutputStream();`
	`271`	`+ } else {`
	`272`	`+ return null;`
	`273`	`+ }`
`266`	`274`	`}`
`267`		`-`
`268`	`275`	`}`