summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2016-06-03 18:21:51 +0100
committerDan Goodliffe <dan@randomdan.homeip.net>2016-06-03 18:21:51 +0100
commit66b5f43006a35d78f24a721d623e98a1109ae7af (patch)
tree954fb3fd327a58f7e9d2add78d97e15bc537f519
parentSplit VFS type converters into simpler base class (diff)
downloadnetfs-66b5f43006a35d78f24a721d623e98a1109ae7af.tar.bz2
netfs-66b5f43006a35d78f24a721d623e98a1109ae7af.tar.xz
netfs-66b5f43006a35d78f24a721d623e98a1109ae7af.zip
Fix volume removalnetfs-1.2.0.1
-rw-r--r--netfs/daemon/daemonVolume.cpp2
-rw-r--r--netfs/unittests/testCore.cpp4
2 files changed, 5 insertions, 1 deletions
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 )