Skip to content

Fixed multiple calls to onStart. #2983

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 17, 2015
Merged

Fixed multiple calls to onStart. #2983

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions src/main/java/rx/internal/operators/OnSubscribeDefer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,28 @@ public OnSubscribeDefer(Func0<? extends Observable<? extends T>> observableFacto
}

@Override
public void call(Subscriber<? super T> s) {
public void call(final Subscriber<? super T> s) {
Observable<? extends T> o;
try {
o = observableFactory.call();
} catch (Throwable t) {
s.onError(t);
return;
}
o.unsafeSubscribe(s);
o.unsafeSubscribe(new Subscriber<T>(s) {
@Override
public void onNext(T t) {
s.onNext(t);
}
@Override
public void onError(Throwable e) {
s.onError(e);
}
@Override
public void onCompleted() {
s.onCompleted();
}
});
}

}
20 changes: 16 additions & 4 deletions src/main/java/rx/internal/operators/OnSubscribeDelaySubscription.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,10 @@
package rx.internal.operators;

import java.util.concurrent.TimeUnit;
import rx.Observable;

import rx.*;
import rx.Observable.OnSubscribe;
import rx.Scheduler;
import rx.Scheduler.Worker;
import rx.Subscriber;
import rx.functions.Action0;

/**
Expand Down Expand Up @@ -50,7 +49,20 @@ public void call(final Subscriber<? super T> s) {
@Override
public void call() {
if (!s.isUnsubscribed()) {
source.unsafeSubscribe(s);
source.unsafeSubscribe(new Subscriber<T>(s) {
@Override
public void onNext(T t) {
s.onNext(t);
}
@Override
public void onError(Throwable e) {
s.onError(e);
}
@Override
public void onCompleted() {
s.onCompleted();
}
});
}
}
}, time, unit);
Expand Down
18 changes: 15 additions & 3 deletions src/main/java/rx/internal/operators/OnSubscribeDelaySubscriptionWithSelector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,8 @@
*/
package rx.internal.operators;

import rx.Observable;
import rx.*;
import rx.Observable.OnSubscribe;
import rx.Subscriber;
import rx.functions.Func0;

/**
Expand All @@ -43,7 +42,20 @@ public void call(final Subscriber<? super T> child) {
@Override
public void onCompleted() {
// subscribe to actual source
source.unsafeSubscribe(child);
source.unsafeSubscribe(new Subscriber<T>(child) {
@Override
public void onNext(T t) {
child.onNext(t);
}
@Override
public void onError(Throwable e) {
child.onError(e);
}
@Override
public void onCompleted() {
child.onCompleted();
}
});
}

@Override
Expand Down
26 changes: 17 additions & 9 deletions src/main/java/rx/internal/operators/OnSubscribeUsing.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,10 @@
import java.util.Arrays;
import java.util.concurrent.atomic.AtomicBoolean;

import rx.Observable;
import rx.*;
import rx.Observable.OnSubscribe;
import rx.Subscriber;
import rx.Subscription;
import rx.exceptions.CompositeException;
import rx.functions.Action0;
import rx.functions.Action1;
import rx.functions.Func0;
import rx.functions.Func1;
import rx.functions.*;

/**
* Constructs an observable sequence that depends on a resource object.
Expand All @@ -48,7 +43,7 @@ public OnSubscribeUsing(Func0<Resource> resourceFactory,
}

@Override
public void call(Subscriber<? super T> subscriber) {
public void call(final Subscriber<? super T> subscriber) {

try {

Expand All @@ -73,7 +68,20 @@ public void call(Subscriber<? super T> subscriber) {
observable = source;
try {
// start
observable.unsafeSubscribe(subscriber);
observable.unsafeSubscribe(new Subscriber<T>(subscriber) {
@Override
public void onNext(T t) {
subscriber.onNext(t);
}
@Override
public void onError(Throwable e) {
subscriber.onError(e);
}
@Override
public void onCompleted() {
subscriber.onCompleted();
}
});
} catch (Throwable e) {
Throwable disposeError = disposeEagerlyIfRequested(disposeOnceOnly);
if (disposeError != null)
Expand Down
15 changes: 14 additions & 1 deletion src/main/java/rx/internal/operators/OperatorDoOnSubscribe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,19 @@ public Subscriber<? super T> call(final Subscriber<? super T> child) {
subscribe.call();
// Pass through since this operator is for notification only, there is
// no change to the stream whatsoever.
return child;
return new Subscriber<T>(child) {
@Override
public void onNext(T t) {
child.onNext(t);
}
@Override
public void onError(Throwable e) {
child.onError(e);
}
@Override
public void onCompleted() {
child.onCompleted();
}
};
}
}
20 changes: 18 additions & 2 deletions src/main/java/rx/internal/operators/OperatorDoOnUnsubscribe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
package rx.internal.operators;

import rx.Observable.Operator;
import rx.Subscriber;
import rx.*;
import rx.functions.Action0;
import rx.subscriptions.Subscriptions;

Expand All @@ -41,6 +41,22 @@ public Subscriber<? super T> call(final Subscriber<? super T> child) {

// Pass through since this operator is for notification only, there is
// no change to the stream whatsoever.
return child;
return new Subscriber<T>(child) {
@Override
public void onStart() {
}
@Override
public void onNext(T t) {
child.onNext(t);
}
@Override
public void onError(Throwable e) {
child.onError(e);
}
@Override
public void onCompleted() {
child.onCompleted();
}
};
}
}
4 changes: 3 additions & 1 deletion src/main/java/rx/internal/operators/OperatorGroupBy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,9 @@ public void call() {
}

}).unsafeSubscribe(new Subscriber<T>(o) {

@Override
public void onStart() {
}
@Override
public void onCompleted() {
o.onCompleted();
Expand Down
17 changes: 15 additions & 2 deletions src/main/java/rx/internal/operators/OperatorMulticast.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,21 @@ public void call() {
guardedSubscription = gs.get();

// register any subscribers that are waiting with this new subject
for(Subscriber<? super R> s : waitingForConnect) {
subject.unsafeSubscribe(s);
for(final Subscriber<? super R> s : waitingForConnect) {
subject.unsafeSubscribe(new Subscriber<R>(s) {
@Override
public void onNext(R t) {
s.onNext(t);
}
@Override
public void onError(Throwable e) {
s.onError(e);
}
@Override
public void onCompleted() {
s.onCompleted();
}
});
}
// clear the waiting list as any new ones that come in after leaving this synchronized block will go direct to the Subject
waitingForConnect.clear();
Expand Down
41 changes: 30 additions & 11 deletions src/main/java/rx/internal/operators/OperatorOnErrorResumeNextViaFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
*/
package rx.internal.operators;

import rx.Observable;
import rx.Producer;
import rx.*;
import rx.Observable.Operator;
import rx.Subscriber;
import rx.exceptions.Exceptions;
import rx.functions.Func1;
import rx.internal.producers.ProducerArbiter;
import rx.plugins.RxJavaPlugins;
import rx.subscriptions.SerialSubscription;

/**
* Instruct an Observable to pass control to another Observable (the return value of a function)
Expand Down Expand Up @@ -51,6 +51,8 @@ public OperatorOnErrorResumeNextViaFunction(Func1<Throwable, ? extends Observabl

@Override
public Subscriber<? super T> call(final Subscriber<? super T> child) {
final ProducerArbiter pa = new ProducerArbiter();
final SerialSubscription ssub = new SerialSubscription();
Subscriber<T> parent = new Subscriber<T>() {

private boolean done = false;
Expand All @@ -74,8 +76,28 @@ public void onError(Throwable e) {
try {
RxJavaPlugins.getInstance().getErrorHandler().handleError(e);
unsubscribe();
Subscriber<T> next = new Subscriber<T>() {
@Override
public void onNext(T t) {
child.onNext(t);
}
@Override
public void onError(Throwable e) {
child.onError(e);
}
@Override
public void onCompleted() {
child.onCompleted();
}
@Override
public void setProducer(Producer producer) {
pa.setProducer(producer);
}
};
ssub.set(next);

Observable<? extends T> resume = resumeFunction.call(e);
resume.unsafeSubscribe(child);
resume.unsafeSubscribe(next);
} catch (Throwable e2) {
child.onError(e2);
}
Expand All @@ -91,16 +113,13 @@ public void onNext(T t) {

@Override
public void setProducer(final Producer producer) {
child.setProducer(new Producer() {
@Override
public void request(long n) {
producer.request(n);
}
});
pa.setProducer(producer);
}

};
child.add(parent);
child.add(ssub);
ssub.set(parent);
child.setProducer(pa);
return parent;
}

Expand Down
2 changes: 0 additions & 2 deletions src/main/java/rx/observers/TestSubscriber.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,6 @@ public TestSubscriber() {
public void onStart() {
if (initialRequest >= 0) {
requestMore(initialRequest);
} else {
super.onStart();
}
}

Expand Down
3 changes: 2 additions & 1 deletion src/test/java/rx/internal/operators/OperatorPublishTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,8 @@ public void call() {
public void call() {
child1Unsubscribed.set(true);
}
}).take(5).subscribe(ts1);
}).take(5)
.subscribe(ts1);

ts1.awaitTerminalEvent();
ts2.awaitTerminalEvent();
Expand Down