fix NPE in Apache HTTP client in case of empty body in HTTP response (e.g. with 204 response code) (thanks to https://github.com/SainagNeelamPatnaik)

kullfar · kullfar · commit 2bfe14f7bfbb · 2019-03-07T13:29:32.000+03:00
diff --git a/changelog b/changelog
@@ -1,5 +1,6 @@
 [SNAPSHOT]
  * support TLS 1.3 in JDK 11 for Salesforce
+ * fix NPE in Apache HTTP client in case of empty body in HTTP response (e.g. with 204 response code) (thanks to https://github.com/SainagNeelamPatnaik)
 
 [6.3.0]
  * fix Muplipart request model and implement it for a jdk HTTP client (thanks to https://github.com/NTPape)
diff --git a/pom.xml b/pom.xml
@@ -107,7 +107,7 @@
                         <dependency>
                             <groupId>com.puppycrawl.tools</groupId>
                             <artifactId>checkstyle</artifactId>
-                            <version>8.17</version>
+                            <version>8.18</version>
                         </dependency>
                     </dependencies>
                 </plugin>
@@ -188,7 +188,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.0.1</version>
+                <version>3.1.0</version>
                 <configuration>
                     <javadocExecutable>${java.home}/bin/javadoc</javadocExecutable>
                     <encoding>UTF-8</encoding>
diff --git a/scribejava-httpclient-ahc/pom.xml b/scribejava-httpclient-ahc/pom.xml
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>org.asynchttpclient</groupId>
             <artifactId>async-http-client</artifactId>
-            <version>2.7.0</version>
+            <version>2.8.1</version>
         </dependency>
         <dependency>
             <groupId>com.github.scribejava</groupId>
diff --git a/scribejava-httpclient-apache/src/main/java/com/github/scribejava/httpclient/apache/OAuthAsyncCompletionHandler.java b/scribejava-httpclient-apache/src/main/java/com/github/scribejava/httpclient/apache/OAuthAsyncCompletionHandler.java
@@ -17,6 +17,7 @@
 import com.github.scribejava.core.model.OAuthRequest.ResponseConverter;
 import com.github.scribejava.core.model.Response;
 import java.io.IOException;
+import org.apache.http.HttpEntity;
 
 public class OAuthAsyncCompletionHandler<T> implements FutureCallback<HttpResponse> {
 
@@ -42,8 +43,9 @@ public void completed(HttpResponse httpResponse) {
 
             final StatusLine statusLine = httpResponse.getStatusLine();
 
+            final HttpEntity httpEntity = httpResponse.getEntity();
             final Response response = new Response(statusLine.getStatusCode(), statusLine.getReasonPhrase(), headersMap,
-                    httpResponse.getEntity().getContent());
+                    httpEntity == null ? null : httpEntity.getContent());
 
             @SuppressWarnings("unchecked")
             final T t = converter == null ? (T) response : converter.convert(response);
