From fcebbef0f432b1a0dc395c8abde2a5a20a0b3f68 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Fri, 29 Jun 2012 02:01:24 -0700 Subject: [PATCH] Fix incorrect transactions states after SQL retrieval --- src/Transaction.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/Transaction.cpp b/src/Transaction.cpp index 1cc4e8e30..fc157e01a 100644 --- a/src/Transaction.cpp +++ b/src/Transaction.cpp @@ -565,11 +565,13 @@ Transaction::pointer Transaction::transactionFromSQL(const std::string& sql) TransStatus st(INVALID); switch (status[0]) { - case TXN_SQL_NEW: st = NEW; break; - case 'A': st = INCLUDED; break; - case 'C': st = CONFLICTED; break; - case 'D': st = COMMITTED; break; - case 'H': st = HELD; break; + case TXN_SQL_NEW: st = NEW; break; + case TXN_SQL_CONFLICT: st = CONFLICTED; break; + case TXN_SQL_HELD: st = HELD; break; + case TXN_SQL_VALIDATED: st = COMMITTED; break; + case TXN_SQL_INCLUDED: st = INCLUDED; break; + case TXN_SQL_UNKNOWN: break; + default: assert(false); } tr->setStatus(st); tr->setLedger(inLedger);