From 2e7664168dcf66a1653d2dab6687fd8714033a79 Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Thu, 19 Feb 2015 00:39:33 +0000 Subject: Tear down adapter on daemon destruction --- netfs/daemon/daemon.cpp | 5 +++++ netfs/daemon/daemon.h | 1 + 2 files changed, 6 insertions(+) diff --git a/netfs/daemon/daemon.cpp b/netfs/daemon/daemon.cpp index cf312bb..b5a2ddd 100644 --- a/netfs/daemon/daemon.cpp +++ b/netfs/daemon/daemon.cpp @@ -13,6 +13,11 @@ NetFSDaemon::NetFSDaemon(const Ice::CommunicatorPtr & i) : { } +NetFSDaemon::~NetFSDaemon() +{ + adapter->deactivate(); +} + std::string NetFSDaemon::hostname() { diff --git a/netfs/daemon/daemon.h b/netfs/daemon/daemon.h index 8cf4d4a..7ed5cb4 100644 --- a/netfs/daemon/daemon.h +++ b/netfs/daemon/daemon.h @@ -10,6 +10,7 @@ class NetFSDaemon : public IceBox::Service { public: NetFSDaemon(const Ice::CommunicatorPtr &); + virtual ~NetFSDaemon(); virtual void start(const std::string&, const Ice::CommunicatorPtr&, const Ice::StringSeq&) override; virtual void stop() override; -- cgit v1.2.3