[Pkg-owncloud-commits] [owncloud-client] 313/470: Merge branch 'do_not_close_db_on_done'

[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 bf99306a53a098242e2082a7ec8e8d372ff6c046
Merge: 844777d 868edb1
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Tue Apr 12 14:36:46 2016 +0200

    Merge branch 'do_not_close_db_on_done'

 src/libsync/ownsql.cpp        |  5 +++++
 src/libsync/ownsql.h          |  2 ++
 src/libsync/syncjournaldb.cpp | 17 ++++++++++++-----
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --cc src/libsync/syncjournaldb.cpp
index a4a27d4,a14c1a6..ae43aad
--- a/src/libsync/syncjournaldb.cpp
+++ b/src/libsync/syncjournaldb.cpp
@@@ -806,12 -806,18 +806,19 @@@ SyncJournalFileRecord SyncJournalDb::ge
              if( !_getFileRecordQuery->nullValue(13) ) {
                  rec._contentChecksumType = _getFileRecordQuery->baValue(13);
              }
 +            _getFileRecordQuery->reset_and_clear_bindings();
          } else {
-             QString err = _getFileRecordQuery->error();
-             qDebug() << "No journal entry found for " << filename << "Error: " << err;
-             locker.unlock();
-             close();
+             int errId = _getFileRecordQuery->errorId();
+             if( errId != SQLITE_DONE ) { // only do this if the problem is different from SQLITE_DONE
+                 QString err = _getFileRecordQuery->error();
+                 qDebug() << "No journal entry found for " << filename << "Error: " << err;
+                 locker.unlock();
+                 close();
+                 locker.relock();
+             }
+         }
+         if (_getFileRecordQuery) {
+             _getFileRecordQuery->reset_and_clear_bindings();
          }
      }
      return rec;

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