Skip to content

Commit bc0a089

Browse files
Joachim HoferJoachim Hofer jmhofer.github@johoop.de
authored andcommitted
made 'next' more typesafe
1 parent 72d9872 commit bc0a089

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

rxjava-core/src/main/java/rx/operators/OperationCombineLatest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public void onError(Exception e) {
9494
}
9595

9696
@Override
97-
public void onNext(Object args) {
97+
public void onNext(T args) {
9898
a.next(this, args);
9999
}
100100
}
@@ -185,7 +185,7 @@ synchronized void error(CombineObserver<R, ?> w, Exception e) {
185185
* @param w
186186
* @param arg
187187
*/
188-
void next(CombineObserver<R, ?> w, Object arg) {
188+
<T> void next(CombineObserver<R, T> w, T arg) {
189189
if (Observer == null) {
190190
throw new RuntimeException("This shouldn't be running if a Observer isn't registered");
191191
}
@@ -485,7 +485,7 @@ public void testAggregateMultipleTypes() {
485485

486486
/* mock the Observable Observers that are 'pushing' data for us */
487487
CombineObserver<String, String> r1 = mock(CombineObserver.class);
488-
CombineObserver<String, Integer> r2 = mock(CombineObserver.class);
488+
CombineObserver<String, String> r2 = mock(CombineObserver.class);
489489

490490
/* pretend we're starting up */
491491
a.addObserver(r1);

0 commit comments

Comments
 (0)