[Zope-Checkins] SVN: Zope/branches/2.10/ Merged r69765:69766 from 2.9 branch.

[Stefan H. Holek]

Log message for revision 69767:
  Merged r69765:69766 from 2.9 branch.
  
  Specifying session-resolution-seconds >= 1200 caused Zope startup to fail.
  Fixes http://www.zope.org/Collectors/Zope/1983
  

Changed:
  U   Zope/branches/2.10/doc/CHANGES.txt
  U   Zope/branches/2.10/lib/python/OFS/Application.py

-=-
Modified: Zope/branches/2.10/doc/CHANGES.txt
===================================================================
--- Zope/branches/2.10/doc/CHANGES.txt	2006-08-24 15:13:43 UTC (rev 69766)
+++ Zope/branches/2.10/doc/CHANGES.txt	2006-08-24 15:20:56 UTC (rev 69767)
@@ -8,6 +8,9 @@
 
     Bugs fixed
 
+      - Collector #1983: Specifying session-resolution-seconds >= 1200 caused
+        Zope startup to fail.
+
       - Collector #2169: webdav.Resource.COPY did not send ObjectClonedEvent.
 
   Zope 2.10.0 beta 2 (2006/08/20)

Modified: Zope/branches/2.10/lib/python/OFS/Application.py
===================================================================
--- Zope/branches/2.10/lib/python/OFS/Application.py	2006-08-24 15:13:43 UTC (rev 69766)
+++ Zope/branches/2.10/lib/python/OFS/Application.py	2006-08-24 15:20:56 UTC (rev 69767)
@@ -426,14 +426,7 @@
                          'session-delete-notify-script-path' % delnotify)
                 delnotify=None
 
-            toc = TransientObjectContainer(
-                'session_data', 'Session Data Container',
-                addNotification = addnotify,
-                delNotification = delnotify,
-                limit=limit,
-                period_secs=period_spec)
-
-            if timeout_spec is not None:
+            if 1:  # Preserve indentation for diff
                 toc = TransientObjectContainer('session_data',
                                                'Session Data Container',
                                                timeout_mins = timeout_spec,