[whimsy] branch master updated: Revert b34276b et sec; can cause Invalid Reference

[sebb]

This is an automated email from the ASF dual-hosted git repository.

sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new 2780b66  Revert b34276b et sec; can cause Invalid Reference
2780b66 is described below

commit 2780b6640e4ada9c770827145c806545c2c914e9
Author: Sebb <s...@apache.org>
AuthorDate: Mon Jan 13 11:26:21 2020 +0000

    Revert b34276b et sec; can cause Invalid Reference
---
 lib/whimsy/asf/ldap.rb | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/lib/whimsy/asf/ldap.rb b/lib/whimsy/asf/ldap.rb
index 23d3944..f0e4969 100644
--- a/lib/whimsy/asf/ldap.rb
+++ b/lib/whimsy/asf/ldap.rb
@@ -1161,17 +1161,16 @@ module ASF
     # list of committers on this project.  Stored in LDAP as a <tt>member</tt>
     # attribute.
     def members
-      self.members = weakref(:members) do
+      members = weakref(:members) do
         ASF.search_one(base, "cn=#{name}", 'member').flatten
       end
 
-      # avoid recursive call to this method
-      @members.map {|uid| Person.find uid[/uid=(.*?),/,1]}
+      members.map {|uid| Person.find uid[/uid=(.*?),/,1]}
     end
 
     # list of member ids in the project
     def memberids
-      self.members = weakref(:members) do
+      members = weakref(:members) do
         ASF.search_one(base, "cn=#{name}", 'member').flatten
       end    
       members.map {|uid| uid[/uid=(.*?),/,1]}
@@ -1180,17 +1179,16 @@ module ASF
     # list of owners on this project.  Stored in LDAP as a <tt>owners</tt>
     # attribute.
     def owners
-      self.owners = weakref(:owners) do
+      owners = weakref(:owners) do
         ASF.search_one(base, "cn=#{name}", 'owner').flatten
       end
 
-      # avoid recursive call to this method
-      @owners.map {|uid| Person.find uid[/uid=(.*?),/,1]}
+      owners.map {|uid| Person.find uid[/uid=(.*?),/,1]}
     end
 
     # list of owner ids in the project
     def ownerids
-      self.owners = weakref(:owners) do
+      owners = weakref(:owners) do
         ASF.search_one(base, "cn=#{name}", 'owner').flatten
       end
       owners.map {|uid| uid[/uid=(.*?),/,1]}
@@ -1387,17 +1385,16 @@ module ASF
 
     # list of members for this service in LDAP
     def members
-      self.members = weakref(:members) do
+      members = weakref(:members) do
         ASF.search_one(base, "cn=#{name}", 'member').flatten
       end
 
-      # avoid recursive call to this method
-      @members.map {|uid| Person.find uid[/uid=(.*?),/,1]}
+      members.map {|uid| Person.find uid[/uid=(.*?),/,1]}
     end
 
     # list of memberids for this service in LDAP
     def memberids
-      self.members = weakref(:members) do
+      members = weakref(:members) do
         ASF.search_one(base, "cn=#{name}", 'member').flatten
       end