From: Yehuda Sadeh <yehuda@hq.newdream.net>
Date: Wed, 24 Aug 2011 01:33:12 +0000 (-0700)
Subject: rgw: fix multipart upload
X-Git-Tag: v0.35~241^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=adf1efe9a94efa9aed2ebda9bbe6e956769d39c6;p=ceph.git

rgw: fix multipart upload

don't try to reset meta object with category
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index ff9ae069601c..d85488821107 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -754,8 +754,10 @@ void RGWPutObj::execute()
       meta_attrs[p] = bl;
 
       rgw_obj meta_obj(s->bucket, multipart_meta_obj, s->object_str, mp_ns);
-      
-      ret = rgwstore->put_obj_meta(s->obj_ctx, s->user.user_id, meta_obj, NULL, meta_attrs, rgw_obj_category_multimeta, false);
+
+      // we don't set a category, since by now a category should have already been assigned
+      string nocategory;
+      ret = rgwstore->put_obj_meta(s->obj_ctx, s->user.user_id, meta_obj, NULL, meta_attrs, nocategory, false);
     }
   }
 done: