From 66f711fc844ccce3d34c5f95928d086ec0915d97 Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 4 Mar 2009 09:20:56 +0000 Subject: merges r22699 from trunk into ruby_1_9_1. -- merged a patch from Alessandro Di Maria in [ruby-core:22560]. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@22758 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ lib/drb/observer.rb | 20 ++++++++++---------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3d52160a2..2ab30725f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Mar 2 00:56:45 2009 Masatoshi SEKI + + * lib/drb/observer.rb: The module oberservable uses now a hash to + store listeners. merged a patch from Alessandro Di Maria in + [ruby-core:22560]. + Sun Mar 1 19:52:46 2009 Nobuyoshi Nakada * ext/dl/win32/lib/Win32API.rb (initialize): passes res diff --git a/lib/drb/observer.rb b/lib/drb/observer.rb index e7f1668c5..149426db7 100644 --- a/lib/drb/observer.rb +++ b/lib/drb/observer.rb @@ -6,16 +6,16 @@ module DRb def notify_observers(*arg) if defined? @observer_state and @observer_state - if defined? @observer_peers - for i in @observer_peers.dup - begin - i.update(*arg) - rescue - delete_observer(i) - end - end - end - @observer_state = false + if defined? @observer_peers + @observer_peers.each do |observer, method| + begin + observer.send(method, *arg) + rescue + delete_observer(observer) + end + end + end + @observer_state = false end end end -- cgit