Fix a race in Observable context destruction

[folly.git] / folly / experimental / observer / Observer-inl.h

diff --git a/folly/experimental/observer/Observer-inl.h b/folly/experimental/observer/Observer-inl.h
index 55088cdfd8b850f5f7ab1234b1e42050de957357..bdc62a092f6c1af3a1bae244b8f7f124b028267c 100644 (file)
--- a/folly/experimental/observer/Observer-inl.h
+++ b/folly/experimental/observer/Observer-inl.h
@@ -38,10 +38,10 @@ Observer<observer_detail::ResultOfUnwrapSharedPtr<F>> makeObserver(
     F&& creator) {
   auto core = observer_detail::Core::
       create([creator = std::forward<F>(creator)]() mutable {
-        return std::static_pointer_cast<void>(creator());
+        return std::static_pointer_cast<const void>(creator());
       });
 
-  observer_detail::ObserverManager::scheduleRefreshNewVersion(core);
+  observer_detail::ObserverManager::initCore(core);
 
   return Observer<observer_detail::ResultOfUnwrapSharedPtr<F>>(core);
 }