From: Yuval Lifshitz <yuvalif@yahoo.com>
Date: Sun, 15 Mar 2020 12:19:52 +0000 (+0200)
Subject: rgw/notifications: fix topic action fail with "MethodNotAllowed"
X-Git-Tag: v14.2.10~190^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=7273170b191acbcbeb4225cf1bd72dc9b78f76a7;p=ceph.git

rgw/notifications: fix topic action fail with "MethodNotAllowed"

Note that this ommit cannot be cherry-picked from master because it's fixing a
regression introduced by a backport which went into 14.2.8.

Fixes: 33bb1bad74234b913a82bb3773022113b02ffa75

Fixes: http://tracker.ceph.com/issues/44614

Signed-off-by: Yuval Lifshitz <yuvalif@yahoo.com>
---

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index 46cb1d98d9939..df3ad393fe611 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -3512,6 +3512,9 @@ RGWOp *RGWHandler_REST_Service_S3::op_post()
     RGWHandler_REST_PSTopic_AWS topic_handler(auth_registry, post_body);
     topic_handler.init(store, s, s->cio);
     auto op = topic_handler.get_op(store);
+    if (op) {
+      return op;
+    }
   }
 
   return NULL;