diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-10-07 15:38:08 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-10-07 15:38:08 +0200 |
commit | 8499c2d29b082f35ac2eb55f7633e0d4103cefe5 (patch) | |
tree | a85e7ab63f8cc96f71d6aca979c3f8d22ca76086 /common/genericresource.cpp | |
parent | 53d571a4ba75474a6d12d0de6b4059c83578e94b (diff) | |
download | sink-8499c2d29b082f35ac2eb55f7633e0d4103cefe5.tar.gz sink-8499c2d29b082f35ac2eb55f7633e0d4103cefe5.zip |
Avoid using the resource object to remove the data from disk.
...because creating it will potentially start transactions on the
database we're about to remove.
Diffstat (limited to 'common/genericresource.cpp')
-rw-r--r-- | common/genericresource.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/common/genericresource.cpp b/common/genericresource.cpp index f5b1775..ef6edc8 100644 --- a/common/genericresource.cpp +++ b/common/genericresource.cpp | |||
@@ -355,16 +355,6 @@ void GenericResource::setupChangereplay(const QSharedPointer<ChangeReplay> &chan | |||
355 | enableChangeReplay(true); | 355 | enableChangeReplay(true); |
356 | } | 356 | } |
357 | 357 | ||
358 | void GenericResource::removeDataFromDisk() | ||
359 | { | ||
360 | SinkLog() << "Removing the resource from disk: " << mResourceInstanceIdentifier; | ||
361 | //Ensure we have no transaction or databases open | ||
362 | mSynchronizer.clear(); | ||
363 | mChangeReplay.clear(); | ||
364 | mPipeline.clear(); | ||
365 | removeFromDisk(mResourceInstanceIdentifier); | ||
366 | } | ||
367 | |||
368 | void GenericResource::removeFromDisk(const QByteArray &instanceIdentifier) | 358 | void GenericResource::removeFromDisk(const QByteArray &instanceIdentifier) |
369 | { | 359 | { |
370 | Sink::Storage(Sink::storageLocation(), instanceIdentifier, Sink::Storage::ReadWrite).removeFromDisk(); | 360 | Sink::Storage(Sink::storageLocation(), instanceIdentifier, Sink::Storage::ReadWrite).removeFromDisk(); |