提交 458c5485 编写于 作者: D David Heinemeier Hansson

Improved the quality of the breakpointing -- especially under FCGI

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@146 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
上级 aaf6956c
...@@ -141,7 +141,7 @@ def method_missing(method, *args) ...@@ -141,7 +141,7 @@ def method_missing(method, *args)
end end
unless [true, false, nil].include?(result) unless [true, false, nil].include?(result)
result.extend(DRbUndumped) rescue nil result.extend(DRbUndumped) if result
end end
return result return result
...@@ -188,7 +188,7 @@ def handle_breakpoint(context, message, file = "", line = "", &block) # :nodoc: ...@@ -188,7 +188,7 @@ def handle_breakpoint(context, message, file = "", line = "", &block) # :nodoc:
@__bp_file = #{file.inspect} @__bp_file = #{file.inspect}
@__bp_line = #{line} @__bp_line = #{line}
extend Breakpoint::CommandBundle extend Breakpoint::CommandBundle
extend DRbUndumped extend DRbUndumped if self
}, context) rescue nil }, context) rescue nil
if not use_drb? then if not use_drb? then
......
...@@ -88,9 +88,12 @@ ...@@ -88,9 +88,12 @@
begin begin
service.register_eval_handler do |code| service.register_eval_handler do |code|
result = eval(code, TOPLEVEL_BINDING) result = eval(code, TOPLEVEL_BINDING)
result.extend(DRb::DRbUndumped) rescue nil if result
result DRbObject.new(result)
end else
result
end
end
service.register_collision_handler do service.register_collision_handler do
msg = [ msg = [
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册