You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2014/05/22 02:55:14 UTC
[3/4] git commit: Fixed pointer ownership bug in Authorizer.
Fixed pointer ownership bug in Authorizer.
Review: https://reviews.apache.org/r/21727
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/ff08376c
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/ff08376c
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/ff08376c
Branch: refs/heads/master
Commit: ff08376c169700162d8c09c25c99e7f1a7a77e0f
Parents: 1f388d1
Author: Vinod Kone <vi...@twitter.com>
Authored: Tue May 20 12:32:33 2014 -0700
Committer: Vinod Kone <vi...@twitter.com>
Committed: Wed May 21 17:55:03 2014 -0700
----------------------------------------------------------------------
include/mesos/mesos.proto | 2 +-
src/authorizer/authorizer.hpp | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/ff08376c/include/mesos/mesos.proto
----------------------------------------------------------------------
diff --git a/include/mesos/mesos.proto b/include/mesos/mesos.proto
index 8012873..ce780ca 100644
--- a/include/mesos/mesos.proto
+++ b/include/mesos/mesos.proto
@@ -644,7 +644,7 @@ message ACL {
*
*/
message ACLs {
- required bool permissive = 1 [default = true];
+ optional bool permissive = 1 [default = true];
repeated ACL.RunTasks run_tasks = 2;
repeated ACL.ReceiveOffers receive_offers = 3;
repeated ACL.HTTPGet http_get = 4;
http://git-wip-us.apache.org/repos/asf/mesos/blob/ff08376c/src/authorizer/authorizer.hpp
----------------------------------------------------------------------
diff --git a/src/authorizer/authorizer.hpp b/src/authorizer/authorizer.hpp
index 75b5a33..a8fde5a 100644
--- a/src/authorizer/authorizer.hpp
+++ b/src/authorizer/authorizer.hpp
@@ -287,7 +287,8 @@ Try<process::Owned<Authorizer> > Authorizer::create(const master::Flags& flags)
return Error(authorizer.error());
}
- return authorizer.get().get();
+ process::Owned<LocalAuthorizer> authorizer_ = authorizer.get();
+ return static_cast<Authorizer*>(authorizer_.release());
}