From a3238beac902cd3f0c2b2cd08c3720f7462b56f4 Mon Sep 17 00:00:00 2001 From: Vincent Pelletier <vincent@nexedi.com> Date: Fri, 5 Mar 2010 15:08:34 +0000 Subject: [PATCH] Factorise self.local_var.tid lookup. git-svn-id: https://svn.erp5.org/repos/neo/trunk@1891 71dcc9de-d417-0410-9af5-da40c76e7ee4 --- neo/client/app.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/neo/client/app.py b/neo/client/app.py index 4e352e4a..aea3ea5e 100644 --- a/neo/client/app.py +++ b/neo/client/app.py @@ -740,13 +740,14 @@ class Application(object): return self._load_lock_acquire() try: + tid = self.local_var.tid # Call function given by ZODB if f is not None: - f(self.local_var.tid) + f(tid) # Call finish on master oid_list = self.local_var.data_dict.keys() - p = Packets.AskFinishTransaction(oid_list, self.local_var.tid) + p = Packets.AskFinishTransaction(oid_list, tid) self._askPrimary(p) if not self.isTransactionFinished(): @@ -761,11 +762,11 @@ class Application(object): del self.mq_cache[oid] else: # Now serial is same as tid - self.mq_cache[oid] = self.local_var.tid, data + self.mq_cache[oid] = tid, data finally: self._cache_lock_release() self.local_var.clear() - return self.local_var.tid + return tid finally: self._load_lock_release() -- 2.30.9