]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: fix crash with rgw_run_sync_thread false 20932/head
authorOrit Wasserman <owasserm@redhat.com>
Wed, 7 Mar 2018 10:01:21 +0000 (12:01 +0200)
committerPrashant D <pdhange@redhat.com>
Thu, 15 Mar 2018 22:06:06 +0000 (18:06 -0400)
Fixes: http://tracker.ceph.com/issues/20448
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
(cherry picked from commit f9395d63f8d7900a22f485d6d143021d0b92d8a0)

src/rgw/rgw_main.cc

index ecbf23a4161ade74ab9c5780346b72b5a769c528..0590a947ec231164c61d6b9de77b161ddf2d867f 100644 (file)
@@ -186,7 +186,11 @@ static RGWRESTMgr *set_logging(RGWRESTMgr *mgr)
 static RGWRESTMgr *rest_filter(RGWRados *store, int dialect, RGWRESTMgr *orig)
 {
   RGWSyncModuleInstanceRef sync_module = store->get_sync_module();
-  return sync_module->get_rest_filter(dialect, orig);
+  if (sync_module) {
+    return sync_module->get_rest_filter(dialect, orig);
+  } else {
+    return orig;
+  }
 }
 
 /*