aboutsummaryrefslogtreecommitdiff
path: root/odb/tracer/connection.cxx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2011-08-24 13:42:04 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2011-08-24 13:42:04 +0200
commit1d42e7cc891403b5f20eb67bc08f23a667019402 (patch)
tree8cad3b525097d47b933e5f10c11ed83c6d661895 /odb/tracer/connection.cxx
parent148e68c83c45bb374785306476351181e00f0a09 (diff)
Add support for transaction multiplexing
Also delay getting a connection until after we do all the sanity checks (e.g., that there is no active transaction). Otherwise we are running risk of getting blocked rather than throwing an exception.
Diffstat (limited to 'odb/tracer/connection.cxx')
-rw-r--r--odb/tracer/connection.cxx6
1 files changed, 1 insertions, 5 deletions
diff --git a/odb/tracer/connection.cxx b/odb/tracer/connection.cxx
index 516e36a..54c233c 100644
--- a/odb/tracer/connection.cxx
+++ b/odb/tracer/connection.cxx
@@ -27,11 +27,7 @@ namespace odb
transaction_impl* connection::
begin ()
{
- if (odb::transaction::has_current ())
- throw already_in_transaction ();
-
- return new transaction_impl (
- connection_ptr (inc_ref (this)));
+ return new transaction_impl (connection_ptr (inc_ref (this)));
}
}
}