[whimsy] branch master updated: make ASF::LDAP.bind work again

[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://gitbox.apache.org/repos/asf/whimsy.git


The following commit(s) were added to refs/heads/master by this push:
     new 513f27a  make ASF::LDAP.bind work again
513f27a is described below

commit 513f27a8285938799cb439afb59727daf506e2fa
Author: Sam Ruby <ru...@intertwingly.net>
AuthorDate: Thu Dec 14 06:48:01 2017 -0500

    make ASF::LDAP.bind work again
---
 lib/whimsy/asf/ldap.rb | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/whimsy/asf/ldap.rb b/lib/whimsy/asf/ldap.rb
index 0747386..a42b3af 100644
--- a/lib/whimsy/asf/ldap.rb
+++ b/lib/whimsy/asf/ldap.rb
@@ -141,14 +141,14 @@ module ASF
       ASF.ldap.unbind if ASF.ldap.bound? rescue nil
       ldap = ASF.init_ldap(true)
       if block
-        self.flush_weakrefs # TODO fails
+        ASF.flush_weakrefs
         ldap.bind(dn, password, &block)
         ASF.init_ldap(true)
       else
         ldap.bind(dn, password)
       end
     ensure
-      self.flush_weakrefs # TODO fails
+      ASF.flush_weakrefs
     end
 
     # validate HTTP authorization, and optionally invoke a block bound to
@@ -368,10 +368,9 @@ module ASF
     @@weakrefs << attr if object == self
   end
 
-  # remove weak references
   def self.flush_weakrefs
     @@weakrefs.each do |attr|
-      object.remove_instance_variable(attr)
+      self.remove_instance_variable(attr)
     end
 
     @@weakrefs.clear

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