(no commit message)

diff --git a/lib/sqlalchemy/objectstore.py b/lib/sqlalchemy/objectstore.py
index d85a9591adc729d9968cc4212ee37f29f19d7644..b4d2ccff92216b220d21ac5ca691b2731b2536dc 100644 (file)
--- a/lib/sqlalchemy/objectstore.py
+++ b/lib/sqlalchemy/objectstore.py
@@ -172,9 +172,9 @@ class UnitOfWork(object):
             obj.__dict__[key] = childlist
         
         if callable(childlist):
-            childlist = childlist()
-            
-        if not isinstance(childlist, util.HistoryArraySet):
+            childlist = UOWListElement(obj, childlist())
+            obj.__dict__[key] = childlist                        
+        elif not isinstance(childlist, util.HistoryArraySet):
             childlist = UOWListElement(obj, childlist)
             obj.__dict__[key] = childlist
         if data is not None and childlist.data != data: