Log message for revision 78755: - Collector #2332: SessionDataManger: don't swallow ConflictErrors
Changed: U Zope/branches/2.10/doc/CHANGES.txt U Zope/branches/2.10/lib/python/Products/Sessions/SessionDataManager.py -=- Modified: Zope/branches/2.10/doc/CHANGES.txt =================================================================== --- Zope/branches/2.10/doc/CHANGES.txt 2007-08-12 09:52:08 UTC (rev 78754) +++ Zope/branches/2.10/doc/CHANGES.txt 2007-08-12 09:53:29 UTC (rev 78755) @@ -11,6 +11,8 @@ - ZopePageTemplate's pt_edit did not recognize content type arguments which had a charset information included. + - Collector #2332: SessionDataManger: don't swallow ConflictErrors + Zope 2.10.4 (23.06.2007) Other changes Modified: Zope/branches/2.10/lib/python/Products/Sessions/SessionDataManager.py =================================================================== --- Zope/branches/2.10/lib/python/Products/Sessions/SessionDataManager.py 2007-08-12 09:52:08 UTC (rev 78754) +++ Zope/branches/2.10/lib/python/Products/Sessions/SessionDataManager.py 2007-08-12 09:53:29 UTC (rev 78755) @@ -15,6 +15,7 @@ from logging import getLogger 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 @@ -219,6 +220,8 @@ LOG.debug('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." % _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins