From 66b5f43006a35d78f24a721d623e98a1109ae7af Mon Sep 17 00:00:00 2001 From: Dan Goodliffe Date: Fri, 3 Jun 2016 18:21:51 +0100 Subject: Fix volume removal --- netfs/daemon/daemonVolume.cpp | 2 +- netfs/unittests/testCore.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/netfs/daemon/daemonVolume.cpp b/netfs/daemon/daemonVolume.cpp index 0a3472c..4dcf8f1 100644 --- a/netfs/daemon/daemonVolume.cpp +++ b/netfs/daemon/daemonVolume.cpp @@ -32,7 +32,7 @@ VolumeServer::~VolumeServer() void VolumeServer::disconnect(const Ice::Current & ice) { - ice.adapter->remove(ice.id); + ice.adapter->removeAllFacets(ice.id); } Ice::Int diff --git a/netfs/unittests/testCore.cpp b/netfs/unittests/testCore.cpp index 5473d0f..0976512 100644 --- a/netfs/unittests/testCore.cpp +++ b/netfs/unittests/testCore.cpp @@ -58,6 +58,10 @@ BOOST_AUTO_TEST_CASE ( daemonInitialised ) auto service = NetFS::ServicePrx::checkedCast(ic->stringToProxy("Service")); BOOST_REQUIRE(service); service->ice_ping(); + + auto volume = service->connect("testvol", std::string()); + volume->ice_ping(); + volume->disconnect(); } BOOST_AUTO_TEST_CASE ( clientInitialised ) -- cgit v1.2.3