From 504abcc00f81aa9f7228a758f6627205fafd69e1 Mon Sep 17 00:00:00 2001 From: matz Date: Mon, 10 Nov 2008 01:52:46 +0000 Subject: * lib/delegate.rb (Delegator.delegating_block): should not refer DelegateClass specific @delegate_dc_obj. a patch from Erik Hollensbe in [ruby-core:19671]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20169 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ lib/delegate.rb | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 68ad46b59c..b5395f001b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Nov 10 10:50:43 2008 Yukihiro Matsumoto + + * lib/delegate.rb (Delegator.delegating_block): should not refer + DelegateClass specific @delegate_dc_obj. a patch from Erik + Hollensbe in [ruby-core:19671]. + Mon Nov 10 09:54:21 2008 NAKAMURA Usaku * win32/win32.c (ifs_open_socket): should retry without proto_buffer diff --git a/lib/delegate.rb b/lib/delegate.rb index 353c68ee97..025e901a89 100644 --- a/lib/delegate.rb +++ b/lib/delegate.rb @@ -234,7 +234,7 @@ end def Delegator.delegating_block(mid) lambda do |*args, &block| begin - @delegate_dc_obj.__send__(mid, *args, &block) + __getobj__.__send__(mid, *args, &block) rescue re = /\A#{Regexp.quote(__FILE__)}:#{__LINE__-2}:/o $!.backtrace.delete_if {|t| re =~ t} -- cgit v1.2.3