[whimsy.git] [1/1] Commit e982856: actually fetch the results the first time around

[Sam Ruby <ru...@apache.org>]

Commit e9828567b1d138fcc64dd15d54945e462c7c9be6:
    actually fetch the results the first time around


Branch: refs/heads/master
Author: Sam Ruby <ru...@intertwingly.net>
Committer: Sam Ruby <ru...@intertwingly.net>
Pusher: rubys <ru...@apache.org>

------------------------------------------------------------
lib/whimsy/asf/ldap.rb                                       | ++++++++ ------
------------------------------------------------------------
27 changes: 15 additions, 12 deletions.
------------------------------------------------------------


diff --git a/lib/whimsy/asf/ldap.rb b/lib/whimsy/asf/ldap.rb
index 3988ba1..9fda6e0 100644
--- a/lib/whimsy/asf/ldap.rb
+++ b/lib/whimsy/asf/ldap.rb
@@ -109,32 +109,35 @@ def self.search_one(base, filter, attrs=nil)
 
   def self.pmc_chairs
     begin
-      @pmc_chairs and @pmc_chairs[0..-1]
+      return @pmc_chairs[0..-1] if @pmc_chairs 
     rescue WeakRef::RefError
-      pmc_chairs ||= Service.find('pmc-chairs').members
-      @pmc_chairs = WeakRef.new(pmc_chairs)
-      pmc_chairs
     end
+
+    pmc_chairs = Service.find('pmc-chairs').members
+    @pmc_chairs = WeakRef.new(pmc_chairs)
+    pmc_chairs
   end
 
   def self.committers
     begin
-      @committers and @committers[0..-1]
+      return @committers[0..-1] if @committers
     rescue WeakRef::RefError
-      committers = Group.find('committers').members
-      @committers = WeakRef.new(committers)
-      committers
     end
+
+    committers = Group.find('committers').members
+    @committers = WeakRef.new(committers)
+    return committers
   end
 
   def self.members
     begin
-      @members and @members[0..-1]
+      return @members[0..-1] if @members
     rescue WeakRef::RefError
-      members ||= Group.find('member').members
-      @members = WeakRef.new(members)
-      members
     end
+
+    members = Group.find('member').members
+    @members = WeakRef.new(members)
+    members
   end
 
   class Base