Allow ObjectWrap destructors before Wrap()

tshinnic · Jun 4, 2010 · 935f843 · 935f843
1 parent 9e8df0e
commit 935f843
Showing 1 changed file with 6 additions and 3 deletions.
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>