Skip to content

Commit

Permalink
Restoring parallel() to using Schedulers.computation()
Browse files Browse the repository at this point in the history
See #713 for background on this.
  • Loading branch information
benjchristensen committed Apr 20, 2014
1 parent 3759b0e commit 9826fc9
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions rxjava-core/src/main/java/rx/Observable.java
Original file line number Diff line number Diff line change
Expand Up @@ -5079,9 +5079,7 @@ public final Observable<T> onExceptionResumeNext(final Observable<? extends T> r
* @see <a href="https://github.com/Netflix/RxJava/wiki/Observable-Utility-Operators#wiki-parallel">RxJava Wiki: parallel()</a>
*/
public final <R> Observable<R> parallel(Func1<Observable<T>, Observable<R>> f) {
// TODO move this back to Schedulers.computation() again once that is properly using eventloops
// see https://github.com/Netflix/RxJava/issues/713 for why this was changed
return lift(new OperatorParallel<T, R>(f, Schedulers.newThread()));
return lift(new OperatorParallel<T, R>(f, Schedulers.computation()));
}

/**
Expand Down

0 comments on commit 9826fc9

Please sign in to comment.