summaryrefslogtreecommitdiff
path: root/server/src/transactionhandler.cc
diff options
context:
space:
mode:
authordeva <deva>2011-02-18 14:16:09 +0000
committerdeva <deva>2011-02-18 14:16:09 +0000
commitbb1c42800a2f48129100222317520b690f13c40e (patch)
tree16ac5d47d22c308f98f4e508b8bb4cfc8ae8ad16 /server/src/transactionhandler.cc
parent4a42852b13d84a283abe54ee569c6d1a8334fa09 (diff)
Made Session isreadonly property private and created new commitMacro method.
Diffstat (limited to 'server/src/transactionhandler.cc')
-rw-r--r--server/src/transactionhandler.cc6
1 files changed, 1 insertions, 5 deletions
diff --git a/server/src/transactionhandler.cc b/server/src/transactionhandler.cc
index 0ebf782..bcdd638 100644
--- a/server/src/transactionhandler.cc
+++ b/server/src/transactionhandler.cc
@@ -54,9 +54,6 @@ static std::string handleCommits(Transaction &transaction, Environment &env,
std::string answer;
if(transaction.commits.size() > 0) {
- AutoBorrower<Database*> borrower(env.dbpool);
- Database *db = borrower.get();
- //Database *db = session.database();
Commits::iterator i = transaction.commits.begin();
while(i != transaction.commits.end()) {
@@ -68,8 +65,7 @@ static std::string handleCommits(Transaction &transaction, Environment &env,
std::string resume = resume_parser(*macro, commit);
commit.fields["journal.resume"] = resume;
- session.isreadonly = false;
- db->commitTransaction(transaction, commit, *macro, session.id());
+ session.commitMacro(transaction, commit, *macro);
if(resume != "") {