Merge pull request #2231 from STEllAR-GROUP/client_serialization

Fixing possible race during future awaiting in serialization.
STEllAR-GROUP · Jun 29, 2016 · e025003 · e025003
2 parents c50ca2c + 15bbd22
commit e025003
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/hpx/runtime/serialization/output_archive.hpp b/hpx/runtime/serialization/output_archive.hpp
@@ -86,8 +86,6 @@ namespace hpx { namespace serialization
         template <typename Future>
         void await_future(Future const & f)
         {
-            if(f.is_ready()) return;
-
             buffer_->await_future(
                 *hpx::traits::future_access<Future>::get_shared_state(f));
         }