]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: fix reset_loc() 5229/head
authorYehuda Sadeh <yehuda@redhat.com>
Wed, 17 Jun 2015 22:11:28 +0000 (15:11 -0700)
committerAbhishek Lekshmanan <abhishek.lekshmanan@ril.com>
Tue, 14 Jul 2015 08:36:07 +0000 (14:06 +0530)
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)

src/rgw/rgw_common.h

index e1688ee369914c6adb3cb51f538b4e9cec182e05..6c7912bd983c726191fd118edc3bc96786fda557 100644 (file)
@@ -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;
     }
   }