0
@@ -89,17 +89,10 @@ initialize_native(VALUE self, VALUE rb_runtime, VALUE UNUSED(options))
0
 //// INFRASTRUCTURE BELOW HERE ////////////////////////////////////////////
0
 ///////////////////////////////////////////////////////////////////////////
0
 
0
-static void deallocate(JohnsonContext* context)
0
-{
0
-  JS_SetContextPrivate(context->js, 0);
0
-  JS_DestroyContext(context->js);
0
-  free(context);
0
-}
0
-
0
 static VALUE allocate(VALUE klass)
0
 {
0
   JohnsonContext* context = calloc(1, sizeof(JohnsonContext));
0
-  return Data_Wrap_Struct(klass, 0, deallocate, context);
0
+  return Data_Wrap_Struct(klass, 0, 0, context);
0
 }
0
 
0
 void init_Johnson_SpiderMonkey_Context(VALUE spidermonkey)

0
@@ -550,10 +550,10 @@ static void finalize(JSContext* js_context, JSObject* obj)
0
 
0
     // remove the proxy OID from the id map
0
     JS_HashTableRemove(runtime->rbids, (void *)self);
0
-    
0
+
0
     // free up the ruby value for GC
0
-    call_ruby_from_js(runtime, NULL, ruby_runtime, rb_intern("remove_gcthing"), 1, self);
0
-  }  
0
+    rb_funcall(ruby_runtime, rb_intern("remove_gcthing"), 1, rb_obj_id(self));
0
+  }
0
 }
0
 
0
 JSBool make_js_land_proxy(JohnsonRuntime* runtime, VALUE value, jsval* retval)

0
@@ -17,8 +17,8 @@ module Johnson #:nodoc:
0
       end
0
       
0
       # called from js_land_proxy.c:finalize
0
-      def remove_gcthing(thing)
0
-        @gcthings.delete(thing.object_id)
0
+      def remove_gcthing(object_id)
0
+        @gcthings.delete(object_id) if @gcthings
0
       end
0
 
0