From 097a8d48b4a3f7d9690f30459797f585e852b1c8 Mon Sep 17 00:00:00 2001 From: Yehuda Sadeh Date: Mon, 12 Aug 2013 10:05:44 -0700 Subject: rgw: fix multi delete Fixes: #5931 Backport: bobtail, cuttlefish Fix a bad check, where we compare the wrong field. Instead of comparing the ret code to 0, we compare the string value to 0 which generates implicit casting, hence the crash. Signed-off-by: Yehuda Sadeh (cherry picked from commit f9f1c48ad799da2b4be0077bf9d61ae116da33d7) Conflicts: src/rgw/rgw_rest_s3.cc --- src/rgw/rgw_rest_s3.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc index 44dccbb0a6a..2c09f6f712b 100644 --- a/src/rgw/rgw_rest_s3.cc +++ b/src/rgw/rgw_rest_s3.cc @@ -1420,7 +1420,7 @@ void RGWDeleteMultiObj_ObjStore_S3::send_partial_response(pair& resu s->formatter->open_object_section("Deleted"); s->formatter->dump_string("Key", result.first); s->formatter->close_section(); - } else if (result.first < 0) { + } else if (result.second < 0) { struct rgw_html_errors r; int err_no; -- cgit v1.2.1