Commit 9dcebb39 authored by Yoshinori Okuji's avatar Yoshinori Okuji

Delay appending an object to the list to avoid an inconsistent state.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@3887 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 875d85e4
...@@ -398,7 +398,6 @@ class ActivityTool (Folder, UniqueObject): ...@@ -398,7 +398,6 @@ class ActivityTool (Folder, UniqueObject):
for m in message_list: for m in message_list:
try: try:
obj = m.getObject(self) obj = m.getObject(self)
object_list.append(obj)
if m.hasExpandMethod(): if m.hasExpandMethod():
for obj in m.getObjectList(self): for obj in m.getObjectList(self):
path = obj.getPath() path = obj.getPath()
...@@ -410,6 +409,7 @@ class ActivityTool (Folder, UniqueObject): ...@@ -410,6 +409,7 @@ class ActivityTool (Folder, UniqueObject):
if path not in path_dict: if path not in path_dict:
path_dict[path] = None path_dict[path] = None
expanded_object_list.append(obj) expanded_object_list.append(obj)
object_list.append(obj)
new_message_list.append(m) new_message_list.append(m)
except ConflictError: except ConflictError:
raise raise
......
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