| Index: src/debug.cc
|
| diff --git a/src/debug.cc b/src/debug.cc
|
| index 4c8214a1b307b7ac0b5727b30c6b00e2d525016d..754a5a0cd23fefce2d6f1d2c40e4c28102d8347d 100644
|
| --- a/src/debug.cc
|
| +++ b/src/debug.cc
|
| @@ -104,9 +104,7 @@ static v8::Handle<v8::Context> GetDebugEventContext(Isolate* isolate) {
|
| Handle<Context> context = isolate->debug()->debugger_entry()->GetContext();
|
| // Isolate::context() may have been NULL when "script collected" event
|
| // occured.
|
| - if (*context == NULL) {
|
| - return v8::Local<v8::Context>();
|
| - }
|
| + if (context.is_null()) return v8::Local<v8::Context>();
|
| Handle<Context> global_context(context->global_context());
|
| return v8::Utils::ToLocal(global_context);
|
| }
|
| @@ -851,7 +849,7 @@ bool Debug::Load() {
|
| NULL);
|
|
|
| // Use the debugger context.
|
| - SaveContext save;
|
| + SaveContext save(isolate);
|
| isolate->set_context(*context);
|
|
|
| // Expose the builtins object in the debugger context.
|
|
|