Skip to content

Commit 1a5fe63

Browse files
Merge pull request #1289 from benjchristensen/schedulers-from-executor
Schedulers.from(Executor)
2 parents b0e87db + 0177a46 commit 1a5fe63

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

rxjava-core/src/main/java/rx/schedulers/Schedulers.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public static TestScheduler test() {
127127
* the executor to wrap
128128
* @return the new Scheduler wrapping the Executor
129129
*/
130-
public static Scheduler newExecutor(Executor executor) {
130+
public static Scheduler from(Executor executor) {
131131
return new ExecutorScheduler(executor);
132132
}
133133
}

rxjava-core/src/test/java/rx/schedulers/ExecutorSchedulerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public class ExecutorSchedulerTest extends AbstractSchedulerConcurrencyTests {
2222

2323
@Override
2424
protected Scheduler getScheduler() {
25-
return Schedulers.newExecutor(Executors.newFixedThreadPool(2, new NewThreadScheduler.RxThreadFactory("TestCustomPool-")));
25+
return Schedulers.from(Executors.newFixedThreadPool(2, new NewThreadScheduler.RxThreadFactory("TestCustomPool-")));
2626
}
2727

2828
}

0 commit comments

Comments
 (0)