Fix NPE

xingwu1 · Mar 21, 2016 · 26c3d3a · 26c3d3a
1 parent 4d07844
commit 26c3d3a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/client-runtime/src/main/java/com/microsoft/rest/ServiceResponseBuilder.java b/client-runtime/src/main/java/com/microsoft/rest/ServiceResponseBuilder.java
@@ -214,7 +214,6 @@ public <THeader> ServiceResponseWithHeaders<T, THeader> buildWithHeaders(Respons
         THeader headers = mapperAdapter.deserialize(
                 mapperAdapter.serialize(response.headers()),
                 headerType);
-        response.errorBody().close();
         return new ServiceResponseWithHeaders<>(bodyResponse.getBody(), headers, bodyResponse.getResponse());
     }
 
@@ -240,7 +239,6 @@ public <THeader> ServiceResponseWithHeaders<T, THeader> buildEmptyWithHeaders(Re
         THeader headers = mapperAdapter.deserialize(
                 mapperAdapter.serialize(response.headers()),
                 headerType);
-        response.errorBody().close();
         return new ServiceResponseWithHeaders<>(headers, bodyResponse.getHeadResponse());
     }
 

diff --git a/client-runtime/src/main/java/com/microsoft/rest/retry/RetryHandler.java b/client-runtime/src/main/java/com/microsoft/rest/retry/RetryHandler.java
@@ -71,7 +71,9 @@ public Response intercept(Chain chain) throws IOException {
         int tryCount = 0;
         while (retryStrategy.shouldRetry(tryCount, response)) {
             tryCount++;
-            response.body().close();
+            if (response.body() != null) {
+                response.body().close();
+            }
             // retry the request
             response = chain.proceed(request);
         }