summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorcjihrig <cjihrig@gmail.com>2017-04-18 21:01:48 -0400
committercjihrig <cjihrig@gmail.com>2017-04-21 13:09:49 -0400
commit58066d16d56ea58d4139bc865349fec9346b12ba (patch)
tree684abceb5cc671a845fd3afb163060ff58cca795 /lib
parent1159a717fc91e4350e8fdb2cfd08815c55f96c11 (diff)
downloadandroid-node-v8-58066d16d56ea58d4139bc865349fec9346b12ba.tar.gz
android-node-v8-58066d16d56ea58d4139bc865349fec9346b12ba.tar.bz2
android-node-v8-58066d16d56ea58d4139bc865349fec9346b12ba.zip
events: remove unreachable code
Commit 8d386ed7e1301c869bbc266ce73650b280c9ae26 stopped the Event Emitter implementation from storing arrays containing a single listener. This change left a section of code in removeListener() as unreachable. This commit removes the unreachable code. Refs: https://github.com/nodejs/node/pull/12043 PR-URL: https://github.com/nodejs/node/pull/12501 Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/events.js19
1 files changed, 5 insertions, 14 deletions
diff --git a/lib/events.js b/lib/events.js
index 7cb30dcf75..1609d66192 100644
--- a/lib/events.js
+++ b/lib/events.js
@@ -374,22 +374,13 @@ EventEmitter.prototype.removeListener =
if (position < 0)
return this;
- if (list.length === 1) {
- if (--this._eventsCount === 0) {
- this._events = Object.create(null);
- return this;
- } else {
- delete events[type];
- }
- } else if (position === 0) {
+ if (position === 0)
list.shift();
- if (list.length === 1)
- events[type] = list[0];
- } else {
+ else
spliceOne(list, position);
- if (list.length === 1)
- events[type] = list[0];
- }
+
+ if (list.length === 1)
+ events[type] = list[0];
if (events.removeListener)
this.emit('removeListener', type, originalListener || listener);