[mesos] branch master updated: Fixed non-deferred callback calling Master::send() in UpdateFramework.

[bbannier]

This is an automated email from the ASF dual-hosted git repository.

bbannier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mesos.git


The following commit(s) were added to refs/heads/master by this push:
     new e08dc03  Fixed non-deferred callback calling Master::send() in 
UpdateFramework.
e08dc03 is described below

commit e08dc03cbe97ced82d8d32e4a2f17f13d33abdae
Author: Andrei Sekretenko <asekrete...@mesosphere.io>
AuthorDate: Fri Jun 7 14:37:54 2019 +0200

    Fixed non-deferred callback calling Master::send() in UpdateFramework.
    
    This fixes code introduced in `3f49e5543df`.
    
    Review: https://reviews.apache.org/r/70809/
---
 src/master/master.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/master/master.cpp b/src/master/master.cpp
index c41d912..2b4e51d 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -3159,7 +3159,7 @@ void Master::updateFramework(
   FrameworkID frameworkId = call.framework_info().id();
 
   updateFramework(std::move(call))
-    .onAny([this, from, frameworkId](
+    .onAny(defer(self(), [this, from, frameworkId](
              const Future<process::http::Response>& response) {
       if (response->code != process::http::Status::OK) {
         CHECK_EQ(response->type, process::http::Response::BODY);
@@ -3167,7 +3167,7 @@ void Master::updateFramework(
         message.set_message(response->body);
         send(from, message);
       }
-    });
+    }));
 }