Fix a write on read situation

plone · Oct 21, 2015 · 229f5c5 · 229f5c5
1 parent 08da06a
commit 229f5c5
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/plone/contentrules/engine/assignments.py b/plone/contentrules/engine/assignments.py
@@ -14,6 +14,8 @@
 from plone.contentrules.engine.interfaces import IRuleAssignment
 from plone.contentrules.engine.interfaces import IRuleAssignmentManager
 
+from plone.protect.utils import safeWrite
+
 from BTrees.OOBTree import OOBTree
 
 
@@ -85,6 +87,10 @@ def ruleAssignmentManagerAdapterFactory(context):
     annotations = IAnnotations(context)
     manager = annotations.get(KEY, None)
     if manager is None:
-        manager = annotations[KEY] = RuleAssignmentManager()
+        annotations[KEY] = RuleAssignmentManager()
+        manager = annotations[KEY]
+        # protect both context and its annotations from a write on read error
+        safeWrite(context)
+        safeWrite(context.__annotations__)
 
     return manager