Add subscription and notification for resource changes; fix a bug while pserver node...

[pti/o2.git] / o2app / adapter / unit_of_work.py

diff --git a/o2app/adapter/unit_of_work.py b/o2app/adapter/unit_of_work.py
index 6fd4ae2..facfc45 100644 (file)
--- a/o2app/adapter/unit_of_work.py
+++ b/o2app/adapter/unit_of_work.py
@@ -73,13 +73,14 @@ class SqlAlchemyUnitOfWork(AbstractUnitOfWork):
 \r
     def _collect_new_events(self):\r
         for entry in self.oclouds.seen:\r
-            while hasattr(entry, 'events') and len(entry.events) > 0:\r
+            # while hasattr(entry, 'events') and len(entry.events) > 0:\r
+            while entry.events is not None and len(entry.events) > 0:\r
                 yield entry.events.pop(0)\r
         for entry in self.resource_pools.seen:\r
-            while hasattr(entry, 'events') and len(entry.events) > 0:\r
+            while entry.events is not None and len(entry.events) > 0:\r
                 yield entry.events.pop(0)\r
         for entry in self.resources.seen:\r
-            while hasattr(entry, 'events') and len(entry.events) > 0:\r
+            while entry.events is not None and len(entry.events) > 0:\r
                 yield entry.events.pop(0)\r
         for entry in self.resource_types.seen:\r
             while hasattr(entry, 'events') and len(entry.events) > 0:\r