[Zope-Checkins] SVN: Zope/branches/2.9/ - Collector #2332: SessionDataManger: don't swallow ConflictErrors

[Andreas Jung]

Log message for revision 78756:
  - Collector #2332: SessionDataManger: don't swallow ConflictErrors
  

Changed:
  U   Zope/branches/2.9/doc/CHANGES.txt
  U   Zope/branches/2.9/lib/python/Products/Sessions/SessionDataManager.py

-=-
Modified: Zope/branches/2.9/doc/CHANGES.txt
===================================================================
--- Zope/branches/2.9/doc/CHANGES.txt	2007-08-12 09:53:29 UTC (rev 78755)
+++ Zope/branches/2.9/doc/CHANGES.txt	2007-08-12 09:55:10 UTC (rev 78756)
@@ -4,6 +4,13 @@
   Change information for previous versions of Zope can be found in the
   file HISTORY.txt.
 
+  Zope 2.9.9 (unreleased)
+
+   Bugs fixed
+
+      - Collector #2332: SessionDataManger: don't swallow ConflictErrors
+
+
   Zope 2.9.8 (2007/07/05)
 
    Bugs fixed

Modified: Zope/branches/2.9/lib/python/Products/Sessions/SessionDataManager.py
===================================================================
--- Zope/branches/2.9/lib/python/Products/Sessions/SessionDataManager.py	2007-08-12 09:53:29 UTC (rev 78755)
+++ Zope/branches/2.9/lib/python/Products/Sessions/SessionDataManager.py	2007-08-12 09:55:10 UTC (rev 78756)
@@ -17,6 +17,7 @@
 
 import Globals
 from OFS.SimpleItem import Item
+from ZODB.POSException import ConflictError
 from Acquisition import Implicit, Explicit, aq_base
 from Persistence import Persistent
 from AccessControl.Owned import Owned
@@ -222,6 +223,8 @@
                     'External data container at %s in use' % args)
                 self._v_wrote_dc_type = 1
             return self.unrestrictedTraverse(self.obpath)
+        except ConflictError:
+            raise
         except:
             raise SessionDataManagerErr, (
                 "External session data container '%s' not found." %