summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorseki <seki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-01 15:57:33 +0000
committerseki <seki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-01 15:57:33 +0000
commitf8d4b61a844318fb7241b17bcf0af3d7ebe488a6 (patch)
tree1df7635b0f0a6cbf64172a8025db15c4ec7baf2d
parent16b0f71cfca594599f372fb4f716019939ab9dda (diff)
downloadruby-f8d4b61a844318fb7241b17bcf0af3d7ebe488a6.tar.gz
ruby-f8d4b61a844318fb7241b17bcf0af3d7ebe488a6.tar.xz
ruby-f8d4b61a844318fb7241b17bcf0af3d7ebe488a6.zip
merged a patch from Alessandro Di Maria in [ruby-core:22560].
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@22699 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--lib/drb/observer.rb20
2 files changed, 16 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 30a261349..fd1779d67 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 22:59:41 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/raddrinfo.c: suppress warnings.
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