fix(subscriber): don't unsubscribe self

When unsubscribing a subscriber's parent, make sure that the subscriber itself is not unsubscribed. Closes ReactiveX#4095
cartant · Sep 6, 2018 · 9d92281 · 9d92281
1 parent 5d92a9b
commit 9d92281
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/internal/Subscriber.ts b/src/internal/Subscriber.ts
@@ -166,7 +166,9 @@ export class Subscriber<T> extends Subscription implements Observer<T> {
  /** @deprecated This is an internal implementation detail, do not use. */
  _unsubscribeParentSubscription() {
  if (this._parentSubscription !== null) {
+ ++this._keepAliveCount;
  this._parentSubscription.unsubscribe();
+ --this._keepAliveCount;
  }
  }
 

diff --git a/src/internal/Subscription.ts b/src/internal/Subscription.ts
@@ -36,6 +36,8 @@ export class Subscription implements SubscriptionLike {
  /** @internal */
  protected _parents: Subscription[] = null;
  /** @internal */
+ protected _keepAliveCount: number = 0;
+ /** @internal */
  private _subscriptions: SubscriptionLike[] = null;
 
  /**
@@ -45,7 +47,6 @@ export class Subscription implements SubscriptionLike {
  constructor(unsubscribe?: () => void) {
  if (unsubscribe) {
  (<any> this)._unsubscribe = unsubscribe;
-
  }
  }
 
@@ -59,7 +60,7 @@ export class Subscription implements SubscriptionLike {
  let hasErrors = false;
  let errors: any[];
 
- if (this.closed) {
+ if (this.closed || this._keepAliveCount > 0) {
  return;
  }