Commit f3151f48 authored by Yoshinori Okuji's avatar Yoshinori Okuji

Create a new TransactionInformation object in handleAskStoreTransaction if not present.

git-svn-id: https://svn.erp5.org/repos/neo/branches/prototype3@130 71dcc9de-d417-0410-9af5-da40c76e7ee4
parent f96ac776
...@@ -301,6 +301,7 @@ class OperationEventHandler(StorageEventHandler): ...@@ -301,6 +301,7 @@ class OperationEventHandler(StorageEventHandler):
o = app.dm.getObject(oid, serial, tid) o = app.dm.getObject(oid, serial, tid)
p = Packet() p = Packet()
if o is not None: if o is not None:
logging.debug('o = %r' % (o,))
serial, next_serial, compression, checksum, data = o serial, next_serial, compression, checksum, data = o
if next_serial is None: if next_serial is None:
next_serial = INVALID_SERIAL next_serial = INVALID_SERIAL
...@@ -341,16 +342,14 @@ class OperationEventHandler(StorageEventHandler): ...@@ -341,16 +342,14 @@ class OperationEventHandler(StorageEventHandler):
def handleAskStoreTransaction(self, conn, packet, tid, user, desc, def handleAskStoreTransaction(self, conn, packet, tid, user, desc,
ext, oid_list): ext, oid_list):
app = self.app uuid = conn.getUUID()
if uuid is None:
try: self.handleUnexpectedPacket(conn, packet)
t = app.transaction_dict[tid]
except KeyError:
p = Packet()
p.protocolError(packet.getId(), 'unknown tid %s' % dump(tid))
conn.addPacket(p)
return return
app = self.app
t = app.transaction_dict.setdefault(tid, TransactionInformation(uuid))
t.addTransaction(oid_list, user, desc, ext) t.addTransaction(oid_list, user, desc, ext)
conn.addPacket(Packet().answerStoreTransaction(packet.getId(), tid)) conn.addPacket(Packet().answerStoreTransaction(packet.getId(), tid))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment