nodejs
diff --git a/‎src/stream_base.cc‎
Lines changed: 5 additions & 0 deletions b/‎src/stream_base.cc‎
Lines changed: 5 additions & 0 deletions
diff --git a/‎src/stream_wrap.cc‎
Lines changed: 1 addition & 2 deletions b/‎src/stream_wrap.cc‎
Lines changed: 1 addition & 2 deletions
@@ -452,6 +452,10 @@ void StreamBase::AddMethods(Environment* env, Local<FunctionTemplate> t) {
 
 void StreamBase::RegisterExternalReferences(
     ExternalReferenceRegistry* registry) {
+  // This function is called by a single thread during start up, so it is safe
+  // to use a local static variable here.
+  static bool is_registered = false;
+  if (is_registered) return;
   registry->Register(GetFD);
   registry->Register(GetExternal);
   registry->Register(GetBytesRead);
@@ -471,6 +475,7 @@ void StreamBase::RegisterExternalReferences(
   registry->Register(
       BaseObject::InternalFieldSet<StreamBase::kOnReadFunctionField,
                                    &Value::IsFunction>);
+  is_registered = true;
 }
 
 void StreamBase::GetFD(const FunctionCallbackInfo<Value>& args) {
 
@@ -108,8 +108,7 @@ void LibuvStreamWrap::RegisterExternalReferences(
   registry->Register(IsConstructCallCallback);
   registry->Register(GetWriteQueueSize);
   registry->Register(SetBlocking);
-  // TODO(joyee): StreamBase::RegisterExternalReferences() is called somewhere
-  // else but we may want to do it here too and guard it with a static flag.
+  StreamBase::RegisterExternalReferences(registry);
 }
 
 LibuvStreamWrap::LibuvStreamWrap(Environment* env,
Original file line number	Diff line number	Diff line change
@@ -108,8 +108,7 @@ void LibuvStreamWrap::RegisterExternalReferences(
108	108	registry->Register(IsConstructCallCallback);
109	109	registry->Register(GetWriteQueueSize);
110	110	registry->Register(SetBlocking);
111		- // TODO(joyee): StreamBase::RegisterExternalReferences() is called somewhere
112		- // else but we may want to do it here too and guard it with a static flag.
	111	+ StreamBase::RegisterExternalReferences(registry);
113	112	}
114	113
115	114	LibuvStreamWrap::LibuvStreamWrap(Environment* env,