Fix resuming objects with no activity associated for real.

This commit is contained in:
Marco Pesenti Gritti 2007-07-20 21:40:41 +02:00
parent 21f8027810
commit 8ae99aaa87

View File

@ -129,13 +129,14 @@ class DSObject(object):
service_name = self.get_activities()[0].service_name service_name = self.get_activities()[0].service_name
activity_id = self.metadata['activity_id'] activity_id = self.metadata['activity_id']
if activity_id: object_id = self.object_id
handle = ActivityHandle(object_id=self.object_id,
activity_id=activity_id)
else:
handle = ActivityHandle(object_id=self.object_id)
if activity_id:
handle = ActivityHandle(object_id=object_id,
activity_id=activity_id)
activityfactory.create(service_name, handle) activityfactory.create(service_name, handle)
else:
activityfactory.create_with_object_id(service_name, object_id)
def destroy(self): def destroy(self):
logging.debug('DSObject.destroy() file_path: %r.' % self._file_path) logging.debug('DSObject.destroy() file_path: %r.' % self._file_path)