src: simplify handlewrap state tracking logic

This also updates the tests to expect that a closed handle has no
reference count.

PR-URL: https://github.com/nodejs/node/pull/6395
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/handle_wrap.cc b/src/handle_wrap.cc
index 85c8d9e9215..b82449989dd 100644
--- a/src/handle_wrap.cc
+++ b/src/handle_wrap.cc
@@ -35,10 +35,7 @@ void HandleWrap::Unref(const FunctionCallbackInfo<Value>& args) {
 
 void HandleWrap::Unrefed(const FunctionCallbackInfo<Value>& args) {
   HandleWrap* wrap = Unwrap<HandleWrap>(args.Holder());
-  // XXX(bnoordhuis) It's debatable whether a nullptr wrap should count
-  // as having a reference count but it's compatible with the logic that
-  // it replaces.
-  args.GetReturnValue().Set(wrap == nullptr || !HasRef(wrap));
+  args.GetReturnValue().Set(!HasRef(wrap));
 }
 
 
@@ -51,6 +48,9 @@ void HandleWrap::Close(const FunctionCallbackInfo<Value>& args) {
   if (!IsAlive(wrap))
     return;
 
+  if (wrap->state_ != kInitialized)
+    return;
+
   CHECK_EQ(false, wrap->persistent().IsEmpty());
   uv_close(wrap->handle__, OnClose);
   wrap->state_ = kClosing;