[Neo-report] r2117 vincent - /trunk/neo/client/app.py

[nobody at svn.erp5.org]

Author: vincent
Date: Sun May 16 19:46:44 2010
New Revision: 2117

Log:
Pass current TID to AskHasLock.

Modified:
    trunk/neo/client/app.py

Modified: trunk/neo/client/app.py
==============================================================================
--- trunk/neo/client/app.py [iso-8859-1] (original)
+++ trunk/neo/client/app.py [iso-8859-1] Sun May 16 19:46:44 2010
@@ -581,7 +581,7 @@
         checksum = makeChecksum(compressed_data)
         p = Packets.AskStoreObject(oid, serial, compression,
                  checksum, compressed_data, self.local_var.tid)
-        on_timeout = OnTimeout(self.onStoreTimeout, oid)
+        on_timeout = OnTimeout(self.onStoreTimeout, self.local_var.tid, oid)
         # Store object in tmp cache
         self.local_var.data_dict[oid] = data
         # Store data on each node
@@ -600,10 +600,10 @@
         self._waitAnyMessage(False)
         return None
 
-    def onStoreTimeout(self, conn, msg_id, oid):
+    def onStoreTimeout(self, conn, msg_id, tid, oid):
         # Ask the storage if someone locks the object.
         # Shorten timeout to react earlier to an unresponding storage.
-        conn.ask(Packets.AskHasLock(oid), timeout=5)
+        conn.ask(Packets.AskHasLock(tid, oid), timeout=5)
         # Stop expecting the timed-out store request.
         self.dispatcher.forget(conn, msg_id)
         return True