Skip to content

Commit ee04650

Browse files
committed
have CompositeObservable#addAll() return a CompositeSubscription instead
1 parent d25a152 commit ee04650

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

src/main/java/rx/javafx/sources/CompositeObservable.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import rx.annotations.Beta;
2121
import rx.subjects.PublishSubject;
2222
import rx.subjects.SerializedSubject;
23+
import rx.subscriptions.CompositeSubscription;
2324

2425
import java.util.Arrays;
2526
import java.util.List;
@@ -75,7 +76,9 @@ public Observable<T> toObservable() {
7576
public Subscription add(Observable<T> observable) {
7677
return observable.subscribe(subject);
7778
}
78-
public List<Subscription> addAll(Observable<T>... observables) {
79-
return Arrays.stream(observables).map(this::add).collect(Collectors.toList());
79+
public CompositeSubscription addAll(Observable<T>... observables) {
80+
final CompositeSubscription subscriptions = new CompositeSubscription();
81+
Arrays.stream(observables).map(this::add).forEach(subscriptions::add);
82+
return subscriptions;
8083
}
8184
}

0 commit comments

Comments
 (0)