ObjectWrap fixed - buffers working!

ry · ry · commit b06dda1f5e6d · 2010-01-27T18:33:15.000-08:00
Hot bug fix from net2 branch.
diff --git a/src/node_object_wrap.h b/src/node_object_wrap.h
@@ -13,15 +13,12 @@ class ObjectWrap {
   }
 
   virtual ~ObjectWrap ( ) {
-    if (!handle_.IsEmpty()) {
-      assert(handle_.IsNearDeath());
-      handle_->SetInternalField(0, v8::Undefined());
-      handle_.Dispose();
-      handle_.Clear();
-    }
+    assert(handle_.IsNearDeath());
+    handle_->SetInternalField(0, v8::Undefined());
+    handle_.Dispose();
+    handle_.Clear();
   }
 
- protected:
   template <class T>
   static inline T* Unwrap (v8::Handle<v8::Object> handle)
   {
@@ -31,6 +28,9 @@ class ObjectWrap {
         handle->GetInternalField(0))->Value());
   }
 
+  v8::Persistent<v8::Object> handle_; // ro
+
+ protected:
   inline void Wrap (v8::Handle<v8::Object> handle)
   {
     assert(handle_.IsEmpty());
@@ -51,8 +51,8 @@ class ObjectWrap {
    */
   virtual void Ref() {
     assert(!handle_.IsEmpty());
-    assert(handle_.IsWeak());
     refs_++;
+    handle_.ClearWeak();
   }
 
   /* Unref() marks an object as detached from the event loop.  This is its
@@ -66,25 +66,20 @@ class ObjectWrap {
    */
   virtual void Unref() {
     assert(!handle_.IsEmpty());
-    assert(handle_.IsWeak());
+    assert(!handle_.IsWeak());
     assert(refs_ > 0);
-    refs_--;
-    if (refs_ == 0 && handle_.IsNearDeath()) delete this;
+    if (--refs_ == 0) { MakeWeak(); }
   }
 
-  v8::Persistent<v8::Object> handle_; // ro
   int refs_; // ro
 
  private:
   static void WeakCallback (v8::Persistent<v8::Value> value, void *data)
   {
     ObjectWrap *obj = static_cast<ObjectWrap*>(data);
     assert(value == obj->handle_);
-    if (obj->refs_ == 0) {
-      delete obj;
-    } else {
-      obj->MakeWeak();
-    }
+    assert(!obj->refs_);
+    if (value.IsNearDeath()) delete obj;
   }
 };
 
