merges r22699 from trunk into ruby_1_9_1.

--
merged a patch from Alessandro Di Maria in [ruby-core:22560].

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@22758 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 16 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index 3d52160a2c..2ab30725f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Mar  2 00:56:45 2009  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
+
+	* 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  <nobu@ruby-lang.org>
 
 	* ext/dl/win32/lib/Win32API.rb (initialize): passes res
diff --git a/lib/drb/observer.rb b/lib/drb/observer.rb
index e7f1668c52..149426db7b 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