[arrow-rs] branch master updated: Fix merge conflict from #4220 (#4242)

[tustvold]

This is an automated email from the ASF dual-hosted git repository.

tustvold pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow-rs.git


The following commit(s) were added to refs/heads/master by this push:
     new ec7706c1f Fix merge conflict from #4220 (#4242)
ec7706c1f is described below

commit ec7706c1f2aeef5a289e46d1df7785e5c93e6bfb
Author: Raphael Taylor-Davies <1781103+tustv...@users.noreply.github.com>
AuthorDate: Thu May 18 10:14:50 2023 +0100

    Fix merge conflict from #4220 (#4242)
---
 object_store/src/azure/client.rs | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/object_store/src/azure/client.rs b/object_store/src/azure/client.rs
index 868a803e9..5ed6f2443 100644
--- a/object_store/src/azure/client.rs
+++ b/object_store/src/azure/client.rs
@@ -188,19 +188,7 @@ impl AzureClient {
                 path: path.as_ref(),
             })?;
 
-        match response.headers().get("x-ms-resource-type") {
-            Some(resource) if resource.as_ref() != b"file" => {
-                Err(crate::Error::NotFound {
-                    path: path.to_string(),
-                    source: format!(
-                        "Not a file, got x-ms-resource-type: {}",
-                        String::from_utf8_lossy(resource.as_ref())
-                    )
-                    .into(),
-                })
-            }
-            _ => Ok(response),
-        }
+        Ok(response)
     }
 
     /// Make an Azure Delete request 
<https://docs.microsoft.com/en-us/rest/api/storageservices/delete-blob>
@@ -304,7 +292,19 @@ impl GetClient for AzureClient {
                 path: path.as_ref(),
             })?;
 
-        Ok(response)
+        match response.headers().get("x-ms-resource-type") {
+            Some(resource) if resource.as_ref() != b"file" => {
+                Err(crate::Error::NotFound {
+                    path: path.to_string(),
+                    source: format!(
+                        "Not a file, got x-ms-resource-type: {}",
+                        String::from_utf8_lossy(resource.as_ref())
+                    )
+                    .into(),
+                })
+            }
+            _ => Ok(response),
+        }
     }
 }