fix parameter of handleAskStoreObject

git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@111 71dcc9de-d417-0410-9af5-da40c76e7ee4

neo/handler.py

@@ -208,7 +208,7 @@ class EventHandler(object):
     def handleUnlockInformation(self, conn, packet, tid):
         self.handleUnexpectedPacket(conn, packet)
 
-    def handleAskStoreObject(self, conn, packet, msg_id, oid, serial,
+    def handleAskStoreObject(self, conn, packet, oid, serial,
                              compression, data, checksum, tid):
         self.handleUnexpectedPacket(conn, packet)
 

neo/storage/handler.py

@@ -202,7 +202,7 @@ class StorageEventHandler(EventHandler):
                                   ext, oid_list):
         self.handleUnexpectedPacket(conn, packet)
 
-    def handleAskStoreObject(self, conn, packet, msg_id, oid, serial,
+    def handleAskStoreObject(self, conn, packet, oid, serial,
                              compression, data, checksum, tid):
         self.handleUnexpectedPacket(conn, packet)
 

neo/storage/operation.py

@@ -354,7 +354,7 @@ class OperationEventHandler(StorageEventHandler):
         t.addTransaction(oid_list, user, desc, ext)
         conn.addPacket(Packet().answerStoreTransaction(packet.getId(), tid))
 
-    def handleAskStoreObject(self, conn, packet, msg_id, oid, serial,
+    def handleAskStoreObject(self, conn, packet, oid, serial,
                              compression, data, checksum, tid):
         uuid = conn.getUUID()
         if uuid is None:
@@ -368,7 +368,7 @@ class OperationEventHandler(StorageEventHandler):
             if locking_tid < tid:
                 # Delay the response.
                 app.queueEvent(self.handleAskStoreObject, conn, packet,
-                               msg_id, oid, serial, compression, data,
+                               packet.getId(), oid, serial, compression, data,
                                checksum, tid)
             else:
                 # If a newer transaction already locks this object,