From: Yehuda Sadeh <yehuda@redhat.com>
Date: Tue, 7 Nov 2017 00:16:34 +0000 (-0800)
Subject: rgw: cr rest splice, reorder checks
X-Git-Tag: v13.1.0~270^2~59
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=741ae31f8692fbdbda90469cb0dbe56449b9f8c3;p=ceph.git

rgw: cr rest splice, reorder checks

First finish output init, then check if there's no data. Could be an empty
object.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/rgw/rgw_cr_rest.cc b/src/rgw/rgw_cr_rest.cc
index cfb1241ffebb..efdab6e820d6 100644
--- a/src/rgw/rgw_cr_rest.cc
+++ b/src/rgw/rgw_cr_rest.cc
@@ -300,10 +300,6 @@ int RGWStreamSpliceCR::operate() {
         continue;
       }
 
-      if (bl.length() == 0 && in_crf->is_done()) {
-        break;
-      }
-
       if (!sent_attrs) {
         int ret = out_crf->init();
         if (ret < 0) {
@@ -317,6 +313,10 @@ int RGWStreamSpliceCR::operate() {
         sent_attrs = true;
       }
 
+      if (bl.length() == 0 && in_crf->is_done()) {
+        break;
+      }
+
       total_read += bl.length();
 
       do {