[Checkins] SVN: z3ext.statusmessage/trunk/ Better checks for session service availability

[Nikolay Kim]

Log message for revision 101022:
  Better checks for session service availability

Changed:
  U   z3ext.statusmessage/trunk/CHANGES.txt
  U   z3ext.statusmessage/trunk/src/z3ext/statusmessage/session.py

-=-
Modified: z3ext.statusmessage/trunk/CHANGES.txt
===================================================================
--- z3ext.statusmessage/trunk/CHANGES.txt	2009-06-15 17:10:31 UTC (rev 101021)
+++ z3ext.statusmessage/trunk/CHANGES.txt	2009-06-15 18:10:52 UTC (rev 101022)
@@ -2,6 +2,12 @@
 CHANGES
 =======
 
+1.3.8 (Unreleased)
+------------------
+
+- Better checks for session service availability
+
+
 1.3.7 (2009-06-04)
 ------------------
 

Modified: z3ext.statusmessage/trunk/src/z3ext/statusmessage/session.py
===================================================================
--- z3ext.statusmessage/trunk/src/z3ext/statusmessage/session.py	2009-06-15 17:10:31 UTC (rev 101021)
+++ z3ext.statusmessage/trunk/src/z3ext/statusmessage/session.py	2009-06-15 18:10:52 UTC (rev 101022)
@@ -16,8 +16,8 @@
 $Id$
 """
 from zope import interface, component
-from zope.component import getAdapter
-from zope.session.interfaces import ISession
+from zope.component import getAdapter, queryUtility
+from zope.session.interfaces import ISession, ISessionDataContainer
 from zope.publisher.interfaces.browser import IBrowserRequest
 
 from null import NullMessageService
@@ -32,6 +32,9 @@
     except:
         return NullMessageService(request)
 
+    if queryUtility(ISessionDataContainer) is None:
+        return NullMessageService(request)
+
     return MessageService(request, session)