From faeb8088ac3bd16bc04a1e5a55fec50285a7253f Mon Sep 17 00:00:00 2001 From: Casey Bodley Date: Wed, 5 Apr 2017 16:19:57 -0400 Subject: [PATCH] rgw: fix for null version_id in fetch_remote_obj() commit 8b43c9781206c22d9aedb4beb8d669bf1e23169f fixed the wrong use of the dest_obj's version, but removed the check for "null" version Signed-off-by: Casey Bodley (cherry picked from commit 915370776df5b964c2ee8d9f9329562919eef8d5) --- src/rgw/rgw_rados.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index 506850ccc9bf7..a67b25b9f002c 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -6759,7 +6759,7 @@ int RGWRados::fetch_remote_obj(RGWObjectCtx& obj_ctx, RGWPutObjProcessor_Atomic processor(obj_ctx, dest_bucket_info, dest_obj.bucket, dest_obj.get_orig_obj(), cct->_conf->rgw_obj_stripe_size, tag, dest_bucket_info.versioning_enabled()); - if (version_id) { + if (version_id && *version_id != "null") { processor.set_version_id(*version_id); } processor.set_olh_epoch(olh_epoch); -- 2.39.5