[Pkg-owncloud-commits] [owncloud-client] 220/484: SyncJournalDB, clear all the queries before closing the database

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit aaf16ff0e898ba8001628ce8387a0ca3a3482022
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Fri Oct 30 14:03:08 2015 +0100

    SyncJournalDB, clear all the queries before closing the database
---
 src/libsync/syncjournaldb.cpp | 4 ++++
 src/libsync/syncjournaldb.h   | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/src/libsync/syncjournaldb.cpp b/src/libsync/syncjournaldb.cpp
index 358f0f3..75b55d9 100644
--- a/src/libsync/syncjournaldb.cpp
+++ b/src/libsync/syncjournaldb.cpp
@@ -457,6 +457,8 @@ void SyncJournalDb::close()
 
     _getFileRecordQuery.reset(0);
     _setFileRecordQuery.reset(0);
+    _setFileRecordChecksumQuery.reset(0);
+    _setFileRecordMetadataQuery.reset(0);
     _getDownloadInfoQuery.reset(0);
     _setDownloadInfoQuery.reset(0);
     _deleteDownloadInfoQuery.reset(0);
@@ -468,6 +470,8 @@ void SyncJournalDb::close()
     _getErrorBlacklistQuery.reset(0);
     _setErrorBlacklistQuery.reset(0);
     _getSelectiveSyncListQuery.reset(0);
+    _getChecksumTypeIdQuery.reset(0);
+    _insertChecksumTypeQuery.reset(0);
 
     _db.close();
     _avoidReadFromDbOnNextSyncFilter.clear();
diff --git a/src/libsync/syncjournaldb.h b/src/libsync/syncjournaldb.h
index 69c7a76..5aab92f 100644
--- a/src/libsync/syncjournaldb.h
+++ b/src/libsync/syncjournaldb.h
@@ -166,6 +166,8 @@ private:
     QString _dbFile;
     QMutex _mutex; // Public functions are protected with the mutex.
     int _transaction;
+
+    // NOTE! when adding a query, don't forget to reset it in SyncJournalDb::close
     QScopedPointer<SqlQuery> _getFileRecordQuery;
     QScopedPointer<SqlQuery> _setFileRecordQuery;
     QScopedPointer<SqlQuery> _setFileRecordChecksumQuery;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git