aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2010-08-20 10:23:55 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2010-08-20 10:23:55 +0200
commitc883d0ba2f4450f35de6767355555fa83e6262ea (patch)
treef1a575f1aa4ab675e5cf8b78f7426d7bfa37bef8
parent9f3fa26aca33674f702f2b7579177c99c61ddcd2 (diff)
Add deadlock exception
-rw-r--r--odb/exceptions.hxx10
-rw-r--r--odb/transaction.cxx3
2 files changed, 5 insertions, 8 deletions
diff --git a/odb/exceptions.hxx b/odb/exceptions.hxx
index b677503..13603be 100644
--- a/odb/exceptions.hxx
+++ b/odb/exceptions.hxx
@@ -10,24 +10,22 @@
namespace odb
{
- // nested_transaction
- //
struct already_in_transaction: odb::exception
{
};
- // no_transaction
- //
struct not_in_transaction: odb::exception
{
};
- // finilized_transaction
- //
struct transaction_already_finilized: odb::exception
{
};
+ struct deadlock: odb::exception
+ {
+ };
+
struct object_not_persistent: odb::exception
{
};
diff --git a/odb/transaction.cxx b/odb/transaction.cxx
index 4fc730a..f9883b6 100644
--- a/odb/transaction.cxx
+++ b/odb/transaction.cxx
@@ -34,9 +34,8 @@ namespace odb
{
rollback ();
}
- catch (const database_exception&)
+ catch (...)
{
- // Ignore it.
}
}