diff options
author | Yehuda Sadeh <yehuda@inktank.com> | 2013-08-12 10:05:44 -0700 |
---|---|---|
committer | Yehuda Sadeh <yehuda@inktank.com> | 2013-08-12 10:39:59 -0700 |
commit | c806c6076114b91c18a79ebf81007c362555b18c (patch) | |
tree | 5a976a2f1ee06f2a4476540e686f4e6c177f1bdc | |
parent | ecaa46a13837305b9382ab319d43890729c54f1e (diff) | |
download | ceph-c806c6076114b91c18a79ebf81007c362555b18c.tar.gz |
rgw: fix multi deletewip-5931-cuttlefish
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 <yehuda@inktank.com>
(cherry picked from commit f9f1c48ad799da2b4be0077bf9d61ae116da33d7)
Conflicts:
src/rgw/rgw_rest_s3.cc
-rw-r--r-- | src/rgw/rgw_rest_s3.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc index 38fab1bd2c1..a88d2a36da7 100644 --- a/src/rgw/rgw_rest_s3.cc +++ b/src/rgw/rgw_rest_s3.cc @@ -1509,7 +1509,7 @@ void RGWDeleteMultiObj_ObjStore_S3::send_partial_response(pair<string,int>& 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; |