Fix RD_SERVER flag
authorHabib Virji <habib.virji@samsung.com>
Thu, 6 Oct 2016 13:33:25 +0000 (14:33 +0100)
committerZiran Sun <ziran.sun@samsung.com>
Fri, 16 Dec 2016 13:09:02 +0000 (13:09 +0000)
Small fix for the build with RD_SERVER flag.

Change-Id: I96eb60e05202635f595c3d1edc82aa634908c95b
Signed-off-by: Habib Virji <habib.virji@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/12903
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/15705
Reviewed-by: Phil Coval <philippe.coval@osg.samsung.com>
Reviewed-by: Todd Malsbary <todd.malsbary@intel.com>
Reviewed-by: Ziran Sun <ziran.sun@samsung.com>
resource/csdk/resource-directory/src/internal/rd_database.c

index 2685219..024ffe0 100644 (file)
@@ -142,7 +142,7 @@ OCStackResult OCRDDatabaseInit(const char *path)
         sqlite3_stmt *stmt = 0;
         VERIFY_SQLITE(sqlite3_prepare_v2 (gRDDB, "PRAGMA foreign_keys = ON;", -1, &stmt, NULL));
 
-        if (sqlite3_step(stmt) != SQLITE_DONE)
+        if (SQLITE_DONE != sqlite3_step(stmt))
         {
             sqlite3_finalize(stmt);
             return OC_STACK_ERROR;
@@ -352,8 +352,10 @@ OCStackResult OCRDDatabaseStoreResources(OCRepPayload *payload, const OCDevAddr
     VERIFY_SQLITE(sqlite3_exec(gRDDB, "COMMIT", NULL, NULL, NULL));
 
     int64_t rowid = sqlite3_last_insert_rowid(gRDDB);
-    VERIFY_SQLITE(storeLinkPayload(payload, rowid));
-
+    if (rowid)
+    {
+        VERIFY_SQLITE(storeLinkPayload(payload, rowid));
+    }
     OICFree(deviceid);
     return OC_STACK_OK;
 }