[Zope-Checkins] SVN: Zope/trunk/ - ZCatalog: refreshCatalog() could not be called safely from a ZEO

[Andreas Jung]

Log message for revision 37952:
  
        - ZCatalog: refreshCatalog() could not be called safely from a ZEO
          client script
  

Changed:
  U   Zope/trunk/doc/CHANGES.txt
  U   Zope/trunk/lib/python/Products/ZCatalog/ZCatalog.py

-=-
Modified: Zope/trunk/doc/CHANGES.txt
===================================================================
--- Zope/trunk/doc/CHANGES.txt	2005-08-16 10:40:48 UTC (rev 37951)
+++ Zope/trunk/doc/CHANGES.txt	2005-08-16 10:42:17 UTC (rev 37952)
@@ -49,6 +49,9 @@
 
     Bugs fixed
 
+      - ZCatalog: refreshCatalog() could not be called safely from a ZEO
+        client script
+
       - Catalog.clear(): fixed handling of _length attribute (caused import
         problems for some .zexp files e.g. Squishdot instances)
 

Modified: Zope/trunk/lib/python/Products/ZCatalog/ZCatalog.py
===================================================================
--- Zope/trunk/lib/python/Products/ZCatalog/ZCatalog.py	2005-08-16 10:40:48 UTC (rev 37951)
+++ Zope/trunk/lib/python/Products/ZCatalog/ZCatalog.py	2005-08-16 10:42:17 UTC (rev 37952)
@@ -231,7 +231,7 @@
 
             for url in urls:
                 obj = self.resolve_path(url)
-                if not obj:
+                if not obj and hasattr(self, 'REQUEST'):
                     obj = self.resolve_url(url, REQUEST)
                 if obj is not None:
                     self.catalog_object(obj, url)