Thanks, I pushed this.
On Wed, Jul 06, 2011 at 02:26:02PM -0700, Ethan Jackson wrote: > Look Good. > > Ethan > > On Wed, Jul 6, 2011 at 14:22, Ben Pfaff <[email protected]> wrote: > > If 'error' is nonnull then we destroy the row, so we must not try to reuse > > the row immediately after that. > > > > Support request #6155. > > Repoted-by: Geoff White <[email protected]> > > --- > > ?ovsdb/file.c | ? ?5 ++--- > > ?1 files changed, 2 insertions(+), 3 deletions(-) > > > > diff --git a/ovsdb/file.c b/ovsdb/file.c > > index 9eea460..05a4067 100644 > > --- a/ovsdb/file.c > > +++ b/ovsdb/file.c > > @@ -333,10 +333,9 @@ ovsdb_file_txn_row_from_json(struct ovsdb_txn *txn, > > struct ovsdb_table *table, > > ? ? ? ? error = ovsdb_file_update_row_from_json(new, converting, json); > > ? ? ? ? if (error) { > > ? ? ? ? ? ? ovsdb_row_destroy(new); > > + ? ? ? ?} else { > > + ? ? ? ? ? ?ovsdb_txn_row_insert(txn, new); > > ? ? ? ? } > > - > > - ? ? ? ?ovsdb_txn_row_insert(txn, new); > > - > > ? ? ? ? return error; > > ? ? } > > ?} > > -- > > 1.7.4.4 > > > > _______________________________________________ > > dev mailing list > > [email protected] > > http://openvswitch.org/mailman/listinfo/dev > > _______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
