X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ovsdb%2Ffile.c;h=605e9cba32f3a2d5e2ae308776b51cac1a674150;hb=bf16ba4a9b1b4a38c867349e70e39d551b406b32;hp=1425bebec549fbc3b022d2c4d54f703673179db9;hpb=ff9f6644cb79d3ea5271c783704eb5092f503612;p=openvswitch diff --git a/ovsdb/file.c b/ovsdb/file.c index 1425bebe..605e9cba 100644 --- a/ovsdb/file.c +++ b/ovsdb/file.c @@ -215,6 +215,7 @@ ovsdb_file_open__(const char *file_name, &date, &txn); json_destroy(json); if (error) { + ovsdb_log_unread(log); break; } @@ -223,7 +224,11 @@ ovsdb_file_open__(const char *file_name, oldest_commit = date; } - ovsdb_error_destroy(ovsdb_txn_commit(txn, false)); + error = ovsdb_txn_commit(txn, false); + if (error) { + ovsdb_log_unread(log); + break; + } } if (error) { /* Log error but otherwise ignore it. Probably the database just got