Merge pull request #1052 from benjchristensen/computation-scheduler

Scheduler Cleanup
ReactiveX · Apr 20, 2014 · d40c868 · d40c868
2 parents 9f84ecb + 9826fc9
commit d40c868
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/rxjava-core/src/main/java/rx/Observable.java b/rxjava-core/src/main/java/rx/Observable.java
@@ -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()));
     }
 
     /**

diff --git a/...a/rx/schedulers/ComputationScheduler.java → ...va/rx/schedulers/EventLoopsScheduler.java b/...a/rx/schedulers/ComputationScheduler.java → ...va/rx/schedulers/EventLoopsScheduler.java
@@ -11,7 +11,7 @@
 import rx.subscriptions.CompositeSubscription;
 import rx.subscriptions.Subscriptions;
 
-/* package */class ComputationScheduler extends Scheduler {
+/* package */class EventLoopsScheduler extends Scheduler {
 
     private static class ComputationSchedulerPool {
         final int cores = Runtime.getRuntime().availableProcessors();

diff --git a/rxjava-core/src/main/java/rx/schedulers/Schedulers.java b/rxjava-core/src/main/java/rx/schedulers/Schedulers.java
@@ -36,7 +36,7 @@ private Schedulers() {
         if (c != null) {
             computationScheduler = c;
         } else {
-            computationScheduler = new ComputationScheduler();
+            computationScheduler = new EventLoopsScheduler();
         }
 
         Scheduler io = RxJavaPlugins.getInstance().getDefaultSchedulers().getIOScheduler();