ovsdb: Slightly simplify ovsdb_table_get_row(), ovsdb_table_put_row().

[openvswitch] / ovsdb / file.c

diff --git a/ovsdb/file.c b/ovsdb/file.c
index 97359d0359b34c7dd05028a8214d22aab7f4c37d..716ea89c5c7ea2c01be234ef86dd75feac4394e6 100644 (file)
--- a/ovsdb/file.c
+++ b/ovsdb/file.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009 Nicira Networks
+/* Copyright (c) 2009, 2010 Nicira Networks
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -261,8 +261,10 @@ ovsdb_file_replica_change_cb(const struct ovsdb_row *old,
             unsigned int idx = column->index;
 
             if (idx != OVSDB_COL_UUID && column->persistent
-                && (!old || !ovsdb_datum_equals(&old->fields[idx],
-                                                &new->fields[idx], type)))
+                && (old
+                    ? !ovsdb_datum_equals(&old->fields[idx], &new->fields[idx],
+                                          type)
+                    : !ovsdb_datum_is_default(&new->fields[idx], type)))
             {
                 if (!row) {
                     row = json_object_create();