[Zope-Checkins] SVN: Zope/branches/2.9/ Fixed ConflictError when using sessions.

[Florent Guillaume]

Log message for revision 41152:
  Fixed ConflictError when using sessions.

Changed:
  U   Zope/branches/2.9/doc/CHANGES.txt
  U   Zope/branches/2.9/lib/python/Products/ZODBMountPoint/MountedObject.py

-=-
Modified: Zope/branches/2.9/doc/CHANGES.txt
===================================================================
--- Zope/branches/2.9/doc/CHANGES.txt	2006-01-05 15:53:38 UTC (rev 41151)
+++ Zope/branches/2.9/doc/CHANGES.txt	2006-01-05 16:41:24 UTC (rev 41152)
@@ -28,6 +28,8 @@
 
       - deprecated OFS.content_types
 
+      - Fixed ConflictError when using sessions.
+
   Zope 2.9.0 beta 2 (2005/12/24)
 
     Bugs fixed

Modified: Zope/branches/2.9/lib/python/Products/ZODBMountPoint/MountedObject.py
===================================================================
--- Zope/branches/2.9/lib/python/Products/ZODBMountPoint/MountedObject.py	2006-01-05 15:53:38 UTC (rev 41151)
+++ Zope/branches/2.9/lib/python/Products/ZODBMountPoint/MountedObject.py	2006-01-05 16:41:24 UTC (rev 41152)
@@ -147,6 +147,10 @@
             conn = anyjar.get_connection(db_name)
         except KeyError:
             conn = self._getDB().open()
+            # FIXME: The following should be done by ZODB's multidatabase
+            # code, it does it correctly for get_connection().
+            anyjar.connections.update(conn.connections)
+            conn.connections = anyjar.connections
         return conn
 
     def mount_error_(self):