update dependencies

kullfar · kullfar · commit 9b0883436014 · 2017-05-15T18:20:46.000+03:00
diff --git a/pom.xml b/pom.xml
@@ -132,7 +132,7 @@
                         <dependency>
                             <groupId>com.puppycrawl.tools</groupId>
                             <artifactId>checkstyle</artifactId>
-                            <version>7.6.1</version>
+                            <version>7.7</version>
                         </dependency>
                     </dependencies>
                 </plugin>
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.0.31</version>
+            <version>2.0.32</version>
         </dependency>
     </dependencies>
 
diff --git a/scribejava-httpclient-okhttp/pom.xml b/scribejava-httpclient-okhttp/pom.xml
@@ -23,12 +23,12 @@
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
-            <version>3.6.0</version>
+            <version>3.8.0</version>
         </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>mockwebserver</artifactId>
-            <version>3.6.0</version>
+            <version>3.8.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/scribejava-httpclient-okhttp/src/main/java/com/github/scribejava/httpclient/okhttp/OkHttpHttpClient.java b/scribejava-httpclient-okhttp/src/main/java/com/github/scribejava/httpclient/okhttp/OkHttpHttpClient.java
@@ -22,6 +22,7 @@
 import java.util.concurrent.ExecutionException;
 import okhttp3.Cache;
 import okhttp3.Headers;
+import okhttp3.ResponseBody;
 
 public class OkHttpHttpClient implements HttpClient {
 
@@ -166,8 +167,9 @@ static Response convertResponse(okhttp3.Response okHttpResponse) {
             headersMap.put(name, headers.get(name));
         }
 
+        final ResponseBody body = okHttpResponse.body();
         return new Response(okHttpResponse.code(), okHttpResponse.message(), headersMap,
-                okHttpResponse.body().byteStream());
+                body == null ? null : body.byteStream());
 
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`import java.util.concurrent.ExecutionException;`
`23`	`23`	`import okhttp3.Cache;`
`24`	`24`	`import okhttp3.Headers;`
	`25`	`+import okhttp3.ResponseBody;`
`25`	`26`
`26`	`27`	`public class OkHttpHttpClient implements HttpClient {`
`27`	`28`
`@@ -166,8 +167,9 @@ static Response convertResponse(okhttp3.Response okHttpResponse) {`
`166`	`167`	`headersMap.put(name, headers.get(name));`
`167`	`168`	`}`
`168`	`169`
	`170`	`+ final ResponseBody body = okHttpResponse.body();`
`169`	`171`	`return new Response(okHttpResponse.code(), okHttpResponse.message(), headersMap,`
`170`		`- okHttpResponse.body().byteStream());`
	`172`	`+ body == null ? null : body.byteStream());`
`171`	`173`
`172`	`174`	`}`
`173`	`175`	`}`