Commit 31afbf6c authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki

remove needless activity dependencies that can cause infinite dependency loop.

parent 6731ccd8
......@@ -71,14 +71,8 @@ class SyncMLPublication(SyncMLSubscription):
"""
Reset all subscribers
"""
id_list = []
for subscriber in self.contentValues(portal_type='SyncML Subscription'):
subscriber.resetSignatureList()
id_list.append(subscriber.getId())
self.activate(activity='SQLQueue',
tag=self.getId(),
after_tag=id_list,
priority=ACTIVITY_PRIORITY).manage_delObjects(id_list)
priority=ACTIVITY_PRIORITY).manage_delObjects(ids=list(self.getObjectIds()))
security.declareProtected(Permissions.AccessContentsInformation,
'getConflictList')
......
......@@ -403,7 +403,6 @@ class SyncMLSubscription(XMLObject):
for i in xrange(0, object_list_len, MAX_OBJECTS):
current_id_list = object_id_list[i:i+MAX_OBJECTS]
self.activate(activity='SQLQueue',
tag=self.getId(),
priority=ACTIVITY_PRIORITY).manage_delObjects(current_id_list)
security.declareProtected(Permissions.AccessContentsInformation,
......@@ -449,7 +448,7 @@ class SyncMLSubscription(XMLObject):
'conflict_resolved_with_merge',
'conflict_resolved_with_client_command_winning'):
if self.getIsActivityEnabled():
signature.activate(tag=self.getId(), activity='SQLQueue',
signature.activate(activity='SQLQueue',
priority=ACTIVITY_PRIORITY).reset()
else:
signature.reset()
......
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