[Zope-CVS] CVS: Products/AdaptableStorage/serial_ofs - FolderItems.py:1.13 FolderItemsByKeychain.py:1.4

[Shane Hathaway]

Update of /cvs-repository/Products/AdaptableStorage/serial_ofs
In directory cvs.zope.org:/tmp/cvs-serv28250/serial_ofs

Modified Files:
	FolderItems.py FolderItemsByKeychain.py 
Log Message:
Corrected storage of mount point objects.  Until now, they were invalid
object references (since accessing the object crossed the database
boundary.)


=== Products/AdaptableStorage/serial_ofs/FolderItems.py 1.12 => 1.13 ===
--- Products/AdaptableStorage/serial_ofs/FolderItems.py:1.12	Fri Jan 10 14:55:38 2003
+++ Products/AdaptableStorage/serial_ofs/FolderItems.py	Wed Feb  5 11:53:22 2003
@@ -46,6 +46,10 @@
         state = []
         event.ignoreAttribute('_objects')
         for id, subob in object.objectItems():
+            mp = subob.__dict__.get('_v_mount_point_')
+            if mp is not None:
+                # Store the mount point rather than the mounted object.
+                subob = mp
             base = aq_base(subob)
             keychain = event.identifyObject(base)
             expected = event.makeKeychain(id, 0)


=== Products/AdaptableStorage/serial_ofs/FolderItemsByKeychain.py 1.3 => 1.4 ===
--- Products/AdaptableStorage/serial_ofs/FolderItemsByKeychain.py:1.3	Mon Jan  6 10:36:50 2003
+++ Products/AdaptableStorage/serial_ofs/FolderItemsByKeychain.py	Wed Feb  5 11:53:22 2003
@@ -45,6 +45,10 @@
         state = []
         event.ignoreAttribute('_objects')
         for id, subob in object.objectItems():
+            mp = subob.__dict__.get('_v_mount_point_')
+            if mp is not None:
+                # Store the mount point rather than the mounted object.
+                subob = mp
             base = aq_base(subob)
             keychain = event.identifyObject(base)
             if keychain is None: