Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/main/java/rx/internal/operators/OperatorTake.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import rx.*;
import rx.Observable.Operator;
import rx.plugins.RxJavaHooks;

/**
* An {@code Observable} that emits the first {@code num} items emitted by the source {@code Observable}.
Expand Down Expand Up @@ -66,6 +67,8 @@ public void onError(Throwable e) {
} finally {
unsubscribe();
}
} else {
RxJavaHooks.onError(e);
}
}

Expand Down
40 changes: 39 additions & 1 deletion src/test/java/rx/internal/operators/OperatorTakeTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,21 @@
import static org.mockito.Matchers.*;
import static org.mockito.Mockito.*;

import java.util.Arrays;
import java.util.*;
import java.util.concurrent.*;
import java.util.concurrent.atomic.*;

import org.junit.Test;
import org.mockito.InOrder;

import rx.*;
import rx.Observable;
import rx.Observable.OnSubscribe;
import rx.Observer;
import rx.exceptions.TestException;
import rx.functions.*;
import rx.observers.*;
import rx.plugins.RxJavaHooks;
import rx.schedulers.Schedulers;
import rx.subjects.PublishSubject;

Expand Down Expand Up @@ -457,4 +460,39 @@ public void takeZero() {
ts.assertCompleted();
}

@Test
public void crashReportedToHooks() {
final List<Throwable> errors = Collections.synchronizedList(new ArrayList<Throwable>());
RxJavaHooks.setOnError(new Action1<Throwable>() {
@Override
public void call(Throwable error) {
errors.add(error);
}
});

try {
Observable.just("1")
.take(1)
.toSingle()
.subscribe(
new Action1<String>() {
@Override
public void call(String it) {
throw new TestException("bla");
}
},
new Action1<Throwable>() {
@Override
public void call(Throwable error) {
errors.add(new AssertionError());
}
}
);

assertEquals("" + errors, 1, errors.size());
assertTrue("" + errors.get(0), errors.get(0).getMessage().equals("bla"));
} finally {
RxJavaHooks.setOnError(null);
}
}
}