Make sure that the original user is restored when portal_catalog fails.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@9014 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5Security/ERP5UserManager.py

@@ -173,10 +173,11 @@ class ERP5UserManager(BasePlugin):
         if sm.getUser() != SUPER_USER:
           newSecurityManager(self, self.getUser(SUPER_USER))
 
-        result = self.getPortalObject().portal_catalog(
+        try:
+          result = self.getPortalObject().portal_catalog(
                                   portal_type="Person", reference=login)
-
-        setSecurityManager(sm)
+        finally:
+          setSecurityManager(sm)
         return [item.getObject() for item in result]
 
 classImplements( ERP5UserManager