lib: don't use emitter.listeners(type).length

Reviewed-by: Trevor Norris <trev.norris@gmail.com>
nodejs · Aug 12, 2014 · 931cbc1 · 931cbc1
1 parent 0718426
commit 931cbc1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/lib/_tls_wrap.js b/lib/_tls_wrap.js
@@ -27,6 +27,7 @@ var crypto = require('crypto');
 var net = require('net');
 var tls = require('tls');
 var util = require('util');
+var listenerCount = require('events').listenerCount;
 var common = require('_tls_common');
 
 var Timer = process.binding('timer_wrap').Timer;
@@ -131,7 +132,7 @@ function requestOCSP(self, hello, ctx, cb) {
   if (ctx.context)
     ctx = ctx.context;
 
-  if (self.server.listeners('OCSPRequest').length === 0) {
+  if (listenerCount(self.server, 'OCSPRequest') === 0) {
     return cb(null);
   } else {
     self.server.emit('OCSPRequest',
@@ -311,9 +312,9 @@ TLSSocket.prototype._init = function(socket) {
     this.ssl.handshakes = 0;
 
     if (this.server &&
-        (this.server.listeners('resumeSession').length > 0 ||
-         this.server.listeners('newSession').length > 0 ||
-         this.server.listeners('OCSPRequest').length > 0)) {
+        (listenerCount(this.server, 'resumeSession') > 0 ||
+         listenerCount(this.server, 'newSession') > 0 ||
+         listenerCount(this.server, 'OCSPRequest') > 0)) {
       this.ssl.enableSessionCallbacks();
     }
   } else {

diff --git a/src/node.js b/src/node.js
@@ -670,7 +670,7 @@
       if (isSignal(type)) {
         assert(signalWraps.hasOwnProperty(type));
 
-        if (this.listeners(type).length === 0) {
+        if (EventEmitter.listenerCount(this, type) === 0) {
           signalWraps[type].close();
           delete signalWraps[type];
         }