Allow ObjectWrap destructors before Wrap()

ry · ry · commit 935f8437fd37 · 2010-06-04T14:30:59.000-07:00
diff --git a/src/node_object_wrap.h b/src/node_object_wrap.h
@@ -13,9 +13,12 @@ class ObjectWrap {
   }
 
   virtual ~ObjectWrap ( ) {
-    handle_->SetInternalField(0, v8::Undefined());
-    handle_.Dispose();
-    handle_.Clear();
+    if (!handle_.IsEmpty()) {
+      assert(handle_.IsNearDeath());
+      handle_->SetInternalField(0, v8::Undefined());
+      handle_.Dispose();
+      handle_.Clear();
+    }
   }
 
   template <class T>

Original file line number	Diff line number	Diff line change
`@@ -13,9 +13,12 @@ class ObjectWrap {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`virtual ~ObjectWrap ( ) {`
`16`		`- handle_->SetInternalField(0, v8::Undefined());`
`17`		`- handle_.Dispose();`
`18`		`- handle_.Clear();`
	`16`	`+ if (!handle_.IsEmpty()) {`
	`17`	`+ assert(handle_.IsNearDeath());`
	`18`	`+ handle_->SetInternalField(0, v8::Undefined());`
	`19`	`+ handle_.Dispose();`
	`20`	`+ handle_.Clear();`
	`21`	`+ }`
`19`	`22`	`}`
`20`	`23`
`21`	`24`	`template <class T>`