[whimsy] branch master updated: just to be sure, get a fresh member list

[ru...@apache.org]

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

rubys pushed a commit to branch master
in repository https://git-dual.apache.org/repos/asf/whimsy.git

The following commit(s) were added to refs/heads/master by this push:
       new  891cc39   just to be sure, get a fresh member list
891cc39 is described below

commit 891cc39d7e6fc6c6272aef723a212a720839cec7
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Wed Apr 6 08:50:47 2016 -0400

    just to be sure, get a fresh member list
---
 lib/whimsy/asf/ldap.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/whimsy/asf/ldap.rb b/lib/whimsy/asf/ldap.rb
index 3201d04..bece91c 100644
--- a/lib/whimsy/asf/ldap.rb
+++ b/lib/whimsy/asf/ldap.rb
@@ -467,6 +467,7 @@ module ASF
     end
 
     def remove(people)
+      @members = nil
       people = (Array(people) & members).map(&:id)
       return if people.empty?
       mod = ::LDAP::Mod.new(::LDAP::LDAP_MOD_DELETE, 'memberUid', people)
@@ -476,6 +477,7 @@ module ASF
     end
 
     def add(people)
+      @members = nil
       people = (Array(people) - members).map(&:id)
       return if people.empty?
       mod = ::LDAP::Mod.new(::LDAP::LDAP_MOD_ADD, 'memberUid', people)
@@ -523,6 +525,7 @@ module ASF
     end
 
     def remove(people)
+      @members = nil
       people = Array(people & members).map(&:dn)
       mod = ::LDAP::Mod.new(::LDAP::LDAP_MOD_DELETE, 'member', people)
       ASF.ldap.modify(self.dn, [mod])
@@ -531,6 +534,7 @@ module ASF
     end
 
     def add(people)
+      @members = nil
       people = Array(people - members).map(&:dn)
       mod = ::LDAP::Mod.new(::LDAP::LDAP_MOD_ADD, 'member', people)
       ASF.ldap.modify(self.dn, [mod])
@@ -577,16 +581,20 @@ module ASF
     end
 
     def remove(people)
+      @members = nil
       people = Array(people - members).map(&:dn)
       mod = ::LDAP::Mod.new(::LDAP::LDAP_MOD_DELETE, 'member', people)
       ASF.ldap.modify(self.dn, [mod])
+    ensure
       @members = nil
     end
 
     def add(people)
+      @members = nil
       people = Array(people & members).map(&:dn)
       mod = ::LDAP::Mod.new(::LDAP::LDAP_MOD_ADD, 'member', people)
       ASF.ldap.modify(self.dn, [mod])
+    ensure
       @members = nil
     end
   end

-- 
To stop receiving notification emails like this one, please contact
['"commits@whimsical.apache.org" <co...@whimsical.apache.org>'].