You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2014/04/17 23:45:16 UTC
git commit: Fixed missing call to delete in Cluster.
Repository: mesos
Updated Branches:
refs/heads/master a57b2eb52 -> 1ff83d71a
Fixed missing call to delete in Cluster.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/1ff83d71
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/1ff83d71
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/1ff83d71
Branch: refs/heads/master
Commit: 1ff83d71a694583859d9c26d7e678e1556acc38f
Parents: a57b2eb
Author: Benjamin Mahler <bm...@twitter.com>
Authored: Thu Apr 17 14:45:03 2014 -0700
Committer: Benjamin Mahler <bm...@twitter.com>
Committed: Thu Apr 17 14:45:03 2014 -0700
----------------------------------------------------------------------
src/tests/cluster.hpp | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/1ff83d71/src/tests/cluster.hpp
----------------------------------------------------------------------
diff --git a/src/tests/cluster.hpp b/src/tests/cluster.hpp
index 21a081c..1862fe8 100644
--- a/src/tests/cluster.hpp
+++ b/src/tests/cluster.hpp
@@ -301,8 +301,6 @@ inline Try<process::PID<master::Master> > Cluster::Masters::start(
std::set<process::UPID>());
master.storage = new state::LogStorage(master.log);
- CHECK_NOTNULL(master.storage);
-
master.state = new state::protobuf::State(master.storage);
master.registrar = new master::Registrar(flags, master.state);
master.repairer = new master::Repairer();
@@ -364,10 +362,11 @@ inline Try<Nothing> Cluster::Masters::stop(
delete master.allocator; // Terminates and waits for allocator process.
delete master.allocatorProcess; // May be NULL.
- delete master.registrar;
delete master.repairer;
+ delete master.registrar;
delete master.state;
delete master.storage;
+ delete master.log;
delete master.contender;
delete master.detector;