From bb1c42800a2f48129100222317520b690f13c40e Mon Sep 17 00:00:00 2001
From: deva <deva>
Date: Fri, 18 Feb 2011 14:16:09 +0000
Subject: Made Session isreadonly property private and created new commitMacro
 method.

---
 server/src/transactionhandler.cc | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'server/src/transactionhandler.cc')

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 != "") {
         
-- 
cgit v1.2.3