Changeset 829246e

Timestamp:

Nov 3, 2009 3:34:24 PM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-2.00, version-3.01, version-3.02

Children:

cbb6396

Parents:

8218a3b

Message:

Merge from 1.30: Multi info was all screwed up if the requester wasn't
authorized to see any one of the experiments. This gracefully handles the
exceptions that check_experiment_access throws. The 1.30 change included
making some Locks RLocks, but I don't think that's required.

File:

• fedd/federation/experiment_control.py (modified) (1 diff)

fedd/federation/experiment_control.py

@@ -2345 +2345 @@
         self.state_lock.acquire()
         for key in [ k for k in self.state.keys() if isinstance(k, fedid)]:
-            self.check_experiment_access(fid, key)
+            try:
+                self.check_experiment_access(fid, key)
+            except service_error, e:
+                if e.code == service_error.access:
+                    continue
+                else:
+                    self.state_lock.release()
+                    raise e
 
             if self.state.has_key(key):