Merge pull request Azure#123 from jianghaolu/404null

Return null on GET 404
sima-zhu · Oct 20, 2016 · 94daf72 · 94daf72
2 parents 9775a7a + b6ea865
commit 94daf72
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/azure-client-runtime/src/main/java/com/microsoft/azure/PagedList.java b/azure-client-runtime/src/main/java/com/microsoft/azure/PagedList.java
@@ -45,6 +45,9 @@ public PagedList() {
      */
     public PagedList(Page<E> page) {
         this();
+        if (page == null) {
+            return;
+        }
         List<E> retrievedItems = page.getItems();
         if (retrievedItems != null) {
             items.addAll(retrievedItems);

diff --git a/client-runtime/src/main/java/com/microsoft/rest/ServiceResponseBuilder.java b/client-runtime/src/main/java/com/microsoft/rest/ServiceResponseBuilder.java
@@ -141,6 +141,8 @@ public ServiceResponse<T> build(Response<ResponseBody> response) throws E, IOExc
             return new ServiceResponse<>((T) buildBody(statusCode, responseBody), response);
         } else if (response.isSuccessful() && responseTypes.size() == 1) {
             return new ServiceResponse<>((T) buildBody(statusCode, responseBody), response);
+        } else if ("GET".equals(response.raw().request().method()) && statusCode == 404) {
+            return new ServiceResponse<>(null, response);
         } else {
             try {
                 String responseContent = responseBody.string();