summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjeg2 <jeg2@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-28 18:51:35 +0000
committerjeg2 <jeg2@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-28 18:51:35 +0000
commitfa9da31def14a2a36ab281bd24c0c40c767800e2 (patch)
treee46a70125ce07d50aceda89a7273cd384d01c9d9
parentc6871cef32d7f7c30b28253cbca18ba071ffebbe (diff)
* lib/xmlrpc/utils.rb: Fixing an incompatibility with
reflection methods returning Symbols. Patch by HD Moore. [ruby-core:29821] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27537 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--lib/xmlrpc/utils.rb4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7ff4007373..6161ac5bd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Apr 29 03:50:49 2010 James Edward Gray II <jeg2@ruby-lang.org>
+
+ * lib/xmlrpc/utils.rb: Fixing an incompatibility with
+ reflection methods returning Symbols. Patch by
+ HD Moore. [ruby-core:29821]
+
Wed Apr 28 23:53:15 2010 Yusuke Endoh <mame@tsg.ne.jp>
* lib/thwait.rb: revise rdoc. a patch from Roger Pack in
diff --git a/lib/xmlrpc/utils.rb b/lib/xmlrpc/utils.rb
index 60d4ef5d99..b86509cb3a 100644
--- a/lib/xmlrpc/utils.rb
+++ b/lib/xmlrpc/utils.rb
@@ -112,7 +112,7 @@ module XMLRPC
def get_methods(obj, delim=".")
prefix = @prefix + delim
@methods.collect { |name, meth, sig, help|
- [prefix + name, obj.method(meth).to_proc, sig, help]
+ [prefix + name.to_s, obj.method(meth).to_proc, sig, help]
}
end
@@ -132,7 +132,7 @@ module XMLRPC
def get_methods(obj, delim=".")
prefix = @prefix + delim
obj.class.public_instance_methods(false).collect { |name|
- [prefix + name, obj.method(name).to_proc, nil, nil]
+ [prefix + name.to_s, obj.method(name).to_proc, nil, nil]
}
end
end