Commit 90ca56009d45e64f4601ec46fb53de8571385bde:
Ensure consistent results if a group has no members
(We assume that the attribute exists)
Branch: refs/heads/master
Author: Sebb <[email protected]>
Committer: Sebb <[email protected]>
Pusher: sebb <[email protected]>
------------------------------------------------------------
lib/whimsy/asf/ldap.rb | +++ ---
------------------------------------------------------------
6 changes: 3 additions, 3 deletions.
------------------------------------------------------------
diff --git a/lib/whimsy/asf/ldap.rb b/lib/whimsy/asf/ldap.rb
index bf7f5ed..c9309ec 100644
--- a/lib/whimsy/asf/ldap.rb
+++ b/lib/whimsy/asf/ldap.rb
@@ -393,8 +393,8 @@ def self.preload
cn = results['dn'].first[/^cn=(.*?),/, 1]
group = ASF::Group.find(cn)
group.modifyTimestamp = results['modifyTimestamp'].first # it is
returned as an array of 1 entry
- members = results['memberUid']
- group.members = members || []
+ members = results['memberUid'] || []
+ group.members = members
[group, members]
end]
end
@@ -426,7 +426,7 @@ def self.preload
cn = results['dn'].first[/^cn=(.*?),/, 1]
committee = ASF::Committee.find(cn)
committee.modifyTimestamp = results['modifyTimestamp'].first # it is
returned as an array of 1 entry
- members = results['member']
+ members = results['member'] || []
committee.members = members
[committee, members]
end]
