[svn] commit: r2434 - in /branches/trac232/src/lib/datasrc: data_source.cc sqlite3_datasrc.cc tests/Makefile.am tests/sqlite3_unittest.cc tests/testdata/ifxr_bad_remove_nonexisting.rrs tests/testdata/ixfr_bad_remove_nonexisting.rrs

[BIND 10 source code commits]

Author: jelte
Date: Thu Jul  8 12:20:08 2010
New Revision: 2434

Log:
bit of dist-related cleanup

Added:
    branches/trac232/src/lib/datasrc/tests/testdata/ixfr_bad_remove_nonexisting.rrs
      - copied unchanged from r2433, branches/trac232/src/lib/datasrc/tests/testdata/ifxr_bad_remove_nonexisting.rrs
Removed:
    branches/trac232/src/lib/datasrc/tests/testdata/ifxr_bad_remove_nonexisting.rrs
Modified:
    branches/trac232/src/lib/datasrc/data_source.cc
    branches/trac232/src/lib/datasrc/sqlite3_datasrc.cc
    branches/trac232/src/lib/datasrc/tests/Makefile.am
    branches/trac232/src/lib/datasrc/tests/sqlite3_unittest.cc

Modified: branches/trac232/src/lib/datasrc/data_source.cc
==============================================================================
--- branches/trac232/src/lib/datasrc/data_source.cc (original)
+++ branches/trac232/src/lib/datasrc/data_source.cc Thu Jul  8 12:20:08 2010
@@ -1029,8 +1029,13 @@
 }
 
 DataSrcTransaction::~DataSrcTransaction() {
-    if (getState() == RUNNING) {
-        _data_source->rollbackTransaction(*this);
+    try {
+        if (getState() == RUNNING) {
+            _data_source->rollbackTransaction(*this);
+        }
+    } catch (...) {
+        // if we have an exception-free logging system we might
+        // want to log something. Otherwise ignore
     }
 }
 

Modified: branches/trac232/src/lib/datasrc/sqlite3_datasrc.cc
==============================================================================
--- branches/trac232/src/lib/datasrc/sqlite3_datasrc.cc (original)
+++ branches/trac232/src/lib/datasrc/sqlite3_datasrc.cc Thu Jul  8 12:20:08 2010
@@ -817,7 +817,6 @@
     }
 }
 
-// Must be exception-free! should we have a catch-all to be sure?
 DataSrc::Result
 Sqlite3DataSrc::rollbackTransaction(DataSrcTransaction& transaction UNUSED_PARAM)
 {

Modified: branches/trac232/src/lib/datasrc/tests/Makefile.am
==============================================================================
--- branches/trac232/src/lib/datasrc/tests/Makefile.am (original)
+++ branches/trac232/src/lib/datasrc/tests/Makefile.am Thu Jul  8 12:20:08 2010
@@ -63,3 +63,5 @@
 EXTRA_DIST += testdata/sql2.example.com.signed
 EXTRA_DIST += testdata/test-root.sqlite3
 EXTRA_DIST += testdata/test.sqlite3
+EXTRA_DIST += testdata/ixfr_ok.rrs
+EXTRA_DIST += testdata/ixfr_bad_remove_nonexisting.rrs

Modified: branches/trac232/src/lib/datasrc/tests/sqlite3_unittest.cc
==============================================================================
--- branches/trac232/src/lib/datasrc/tests/sqlite3_unittest.cc (original)
+++ branches/trac232/src/lib/datasrc/tests/sqlite3_unittest.cc Thu Jul  8 12:20:08 2010
@@ -1325,7 +1325,7 @@
     // a bad ixfr, tries to remove a non-existant RR
     Message ixfr_msg(Message::RENDER);
     ASSERT_EQ(0, ixfrFromFile(ixfr_msg, TEST_DATA_DIR
-              "/ifxr_bad_remove_nonexisting.rrs"));
+              "/ixfr_bad_remove_nonexisting.rrs"));
     DataSrcTransaction transaction1(&data_source, zone_name);
     data_source.startTransaction(transaction1);
     EXPECT_EQ(DataSrc::ERROR,