Permalink
Browse files

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
  • Loading branch information...
1 parent aaf6956 commit 458c5485a1165f8a3264040ea3761c0ceb1dc7f5 @dhh dhh committed Dec 13, 2004
Showing with 8 additions and 5 deletions.
  1. +2 −2 railties/lib/breakpoint.rb
  2. +6 −3 railties/lib/breakpoint_client.rb
@@ -141,7 +141,7 @@ def method_missing(method, *args)
end
unless [true, false, nil].include?(result)
- result.extend(DRbUndumped) rescue nil
+ result.extend(DRbUndumped) if result
end
return result
@@ -188,7 +188,7 @@ def handle_breakpoint(context, message, file = "", line = "", &block) # :nodoc:
@__bp_file = #{file.inspect}
@__bp_line = #{line}
extend Breakpoint::CommandBundle
- extend DRbUndumped
+ extend DRbUndumped if self
}, context) rescue nil
if not use_drb? then
@@ -88,9 +88,12 @@
begin
service.register_eval_handler do |code|
result = eval(code, TOPLEVEL_BINDING)
- result.extend(DRb::DRbUndumped) rescue nil
- result
- end
+ if result
+ DRbObject.new(result)
+ else
+ result
+ end
+ end
service.register_collision_handler do
msg = [

0 comments on commit 458c548

Please sign in to comment.