From: Yehuda Sadeh <yehuda@redhat.com>
Date: Wed, 17 Jun 2015 22:11:28 +0000 (-0700)
Subject: rgw: fix reset_loc()
X-Git-Tag: v0.94.3~13^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F5229%2Fhead;p=ceph.git

rgw: fix reset_loc()

Fixes: #11974

Only need to set locator for underscore if namespace is empty

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
(cherry picked from commit d3bd27f4855df6bb207b656527138026af1a36a2)
---

diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h
index e1688ee3699..6c7912bd983 100644
--- a/src/rgw/rgw_common.h
+++ b/src/rgw/rgw_common.h
@@ -1230,7 +1230,7 @@ public:
      * having object locator at all for most objects but the ones that started with underscore as
      * these were escaped.
      */
-    if (orig_obj[0] == '_') {
+    if (orig_obj[0] == '_' && ns.empty()) {
       loc = orig_obj;
     }
   }