merge fix on branch rev15295

svn: r15327
2010-05-05 11:47:18 +00:00
parent 788b731168
commit e2e3065cfb
1 changed files with 1 additions and 1 deletions
--- a/src/gen/proxy/proxybase.py
+++ b/src/gen/proxy/proxybase.py
@@ -306,7 +306,7 @@ class ProxyDbBase(DbReadBase):
        """
        Returns obj if predicate is True or not callable, else returns None
        """
-        if predicate is not None:
+        if predicate is not None and obj is not None:
            return obj if predicate(obj.handle) else None
        return obj