[Neo-report] r2517 vincent - in /trunk/neo/client: app.py handlers/master.py

nobody at svn.erp5.org nobody at svn.erp5.org
Mon Dec 13 11:56:18 CET 2010


Author: vincent
Date: Mon Dec 13 11:56:17 2010
New Revision: 2517

Log:
Remove txn_finished.

The only alternative to this is raising (either because there was no
answer, or because the answer didn't satisfy our handler).

Modified:
    trunk/neo/client/app.py
    trunk/neo/client/handlers/master.py

Modified: trunk/neo/client/app.py
==============================================================================
--- trunk/neo/client/app.py [iso-8859-1] (original)
+++ trunk/neo/client/app.py [iso-8859-1] Mon Dec 13 11:56:17 2010
@@ -108,7 +108,6 @@ class ThreadContext(object):
             'resolved_conflict_serial_dict': {},
             'object_stored': 0,
             'txn_voted': False,
-            'txn_finished': False,
             'queue': queue,
             'txn_info': 0,
             'history': None,
@@ -879,9 +878,6 @@ class Application(object):
             p = Packets.AskFinishTransaction(tid, oid_list)
             self._askPrimary(p)
 
-            if not self.isTransactionFinished():
-                raise NEOStorageError('tpc_finish failed')
-
             # Update cache
             self._cache_lock_acquire()
             try:
@@ -1237,12 +1233,6 @@ class Application(object):
     def getTID(self):
         return self.local_var.tid
 
-    def setTransactionFinished(self):
-        self.local_var.txn_finished = True
-
-    def isTransactionFinished(self):
-        return self.local_var.txn_finished
-
     def setTransactionVoted(self):
         self.local_var.txn_voted = True
 

Modified: trunk/neo/client/handlers/master.py
==============================================================================
--- trunk/neo/client/handlers/master.py [iso-8859-1] (original)
+++ trunk/neo/client/handlers/master.py [iso-8859-1] Mon Dec 13 11:56:17 2010
@@ -169,7 +169,6 @@ class PrimaryAnswersHandler(AnswerBaseHa
     def answerTransactionFinished(self, conn, tid):
         if tid != self.app.getTID():
             raise ProtocolError('Wrong TID, transaction not started')
-        self.app.setTransactionFinished()
 
     def answerPack(self, conn, status):
         if not status:




More information about the Neo-report mailing list