Avoid double disconnect of DB handle

Change-Id: I17e653797890893e2ea8018f1983d63d67623452

diff --git a/lib/media-util-db.c b/lib/media-util-db.c
index cecba1d9d80d714de901fffd0a4a767e52cc7099..a1b6a7b080573a90dad0097d8dbf0c6db009d0e7 100644 (file)
--- a/lib/media-util-db.c
+++ b/lib/media-util-db.c
@@ -284,10 +284,8 @@ void media_db_disconnect(sqlite3 *handle)
 {
        MSAPI_DBG_FUNC();
 
-       if (handle) {
+       if (handle)
                sqlite3_close_v2(handle);
-               handle = NULL;
-       }
 }
 
 int media_db_request_update_db(const char *query_str, uid_t uid)

diff --git a/packaging/media-server.spec b/packaging/media-server.spec
index ab146ea6a875cdec98c89cd11635c4addff21aef..76c6d153abaee160c7406282858f8397a2a55556 100644 (file)
--- a/packaging/media-server.spec
+++ b/packaging/media-server.spec
@@ -1,6 +1,6 @@
 Name:       media-server
 Summary:    A server for media content management
-Version:    0.6.10
+Version:    0.6.11
 Release:    0
 Group:      Multimedia/Service
 License:    Apache-2.0

diff --git a/src/scanner-v2/media-scanner-extract-v2.c b/src/scanner-v2/media-scanner-extract-v2.c
index 0e690a849bb2272b839c1bb78bb94f783588e99e..478c2ce133ed0227f261f98c71f495a39ba5af84 100644 (file)
--- a/src/scanner-v2/media-scanner-extract-v2.c
+++ b/src/scanner-v2/media-scanner-extract-v2.c
@@ -257,6 +257,8 @@ NEXT:
                }
 
                ms_disconnect_db(handle);
+               handle = NULL;
+
                usleep(SCAN_SLEEP_TIME);
        }
 
@@ -378,6 +380,7 @@ NEXT:
 
                /*disconnect form media db*/
                ms_disconnect_db(handle);
+               handle = NULL;
 
                /*Active flush */
                malloc_trim(0);

diff --git a/src/scanner-v2/media-scanner-scan-v2.c b/src/scanner-v2/media-scanner-scan-v2.c
index 2f5f7850c0d68360eef66107062d01ca63d26daf..5d484c24bbeee6bf5ae66758b7b0a976fdeb7366 100644 (file)
--- a/src/scanner-v2/media-scanner-scan-v2.c
+++ b/src/scanner-v2/media-scanner-scan-v2.c
@@ -999,6 +999,8 @@ NEXT:
                MS_DBG_WARN("DIRECTORY SCAN END [%d]", ret);
 
                ms_disconnect_db(handle);
+               handle = NULL;
+
                usleep(SCAN_SLEEP_TIME);
        }
 
@@ -1105,6 +1107,7 @@ NEXT:
                        goto _POWEROFF;
 
                ms_disconnect_db(handle);
+               handle = NULL;
 
                malloc_trim(0);