Commit 19e651d4 authored by Vincent Pelletier's avatar Vincent Pelletier

CMFActivity.Activity.SQLBase: Avoid reference loops.

Unsure whether this makes a difference, but let's be on the safe side.
parent 94a179a6
...@@ -664,6 +664,7 @@ CREATE TABLE %s ( ...@@ -664,6 +664,7 @@ CREATE TABLE %s (
% [(m.uid, m.object_path, m.method_id) for m in message_list]) % [(m.uid, m.object_path, m.method_id) for m in message_list])
for m in message_list: for m in message_list:
m.setExecutionState(MESSAGE_NOT_EXECUTED, exc_info, log=False) m.setExecutionState(MESSAGE_NOT_EXECUTED, exc_info, log=False)
del exc_info
self._abort() self._abort()
exc_info = message_list[0].exc_info exc_info = message_list[0].exc_info
if exc_info: if exc_info:
...@@ -671,7 +672,6 @@ CREATE TABLE %s ( ...@@ -671,7 +672,6 @@ CREATE TABLE %s (
# Register it again. # Register it again.
with activity_runtime_environment: with activity_runtime_environment:
cancel = message.on_error_callback(*exc_info) cancel = message.on_error_callback(*exc_info)
del exc_info, message.exc_info
transaction.commit() transaction.commit()
if cancel: if cancel:
message.setExecutionState(MESSAGE_EXECUTED) message.setExecutionState(MESSAGE_EXECUTED)
...@@ -679,6 +679,7 @@ CREATE TABLE %s ( ...@@ -679,6 +679,7 @@ CREATE TABLE %s (
self._log(WARNING, 'Exception raised when processing error callbacks') self._log(WARNING, 'Exception raised when processing error callbacks')
message.setExecutionState(MESSAGE_NOT_EXECUTED) message.setExecutionState(MESSAGE_NOT_EXECUTED)
self._abort() self._abort()
del exc_info, message.exc_info
self.finalizeMessageExecution(activity_tool, message_list, self.finalizeMessageExecution(activity_tool, message_list,
uid_to_duplicate_uid_list_dict) uid_to_duplicate_uid_list_dict)
transaction.commit() transaction.commit()
......
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