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

[Andreas Jung]

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

Changed:
  U   Zope/branches/Zope-2_8-branch/doc/CHANGES.txt
  U   Zope/branches/Zope-2_8-branch/lib/python/Products/ZCatalog/ZCatalog.py

-=-
Modified: Zope/branches/Zope-2_8-branch/doc/CHANGES.txt
===================================================================
--- Zope/branches/Zope-2_8-branch/doc/CHANGES.txt	2005-08-16 10:07:09 UTC (rev 37950)
+++ Zope/branches/Zope-2_8-branch/doc/CHANGES.txt	2005-08-16 10:40:48 UTC (rev 37951)
@@ -26,6 +26,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/branches/Zope-2_8-branch/lib/python/Products/ZCatalog/ZCatalog.py
===================================================================
--- Zope/branches/Zope-2_8-branch/lib/python/Products/ZCatalog/ZCatalog.py	2005-08-16 10:07:09 UTC (rev 37950)
+++ Zope/branches/Zope-2_8-branch/lib/python/Products/ZCatalog/ZCatalog.py	2005-08-16 10:40:48 UTC (rev 37951)
@@ -295,7 +295,8 @@
 
             p = paths[i]
             obj = self.resolve_path(p)
-            if not obj:
+            
+            if not obj and hasattr(self, 'REQUEST'):
                 obj = self.resolve_url(p, self.REQUEST)
             if obj is not None:
                 try: