Fix merge conflict from #4220 (#4242)

apache · May 18, 2023 · ec7706c · ec7706c
1 parent 077328c
commit ec7706c
Showing 1 changed file with 14 additions and 14 deletions.
diff --git 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),
+        }
     }
 }