Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Fix the issue that map may swallow fatal exceptions #2156

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 24, 2014
+22 −0
Merged

Fix the issue that map may swallow fatal exceptions #2156

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions src/main/java/rx/internal/operators/OperatorMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import rx.Observable.Operator;
import rx.Subscriber;
import rx.exceptions.Exceptions;
import rx.exceptions.OnErrorThrowable;
import rx.functions.Func1;

Expand Down Expand Up @@ -53,6 +54,7 @@ public void onNext(T t) {
try {
o.onNext(transformer.call(t));
} catch (Throwable e) {
Exceptions.throwIfFatal(e);
onError(OnErrorThrowable.addValueAsLastCause(e, t));
}
}
Expand Down
20 changes: 20 additions & 0 deletions src/test/java/rx/internal/operators/OperatorMapTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,4 +319,24 @@ private static Map<String, String> getMap(String prefix) {
m.put("lastName", prefix + "Last");
return m;
}

@Test(expected = OnErrorNotImplementedException.class)
public void testShouldNotSwallowOnErrorNotImplementedException() {
Observable.just("a", "b").flatMap(new Func1<String, Observable<String>>() {
@Override
public Observable<String> call(String s) {
return Observable.just(s + "1", s + "2");
}
}).flatMap(new Func1<String, Observable<String>>() {
@Override
public Observable<String> call(String s) {
return Observable.error(new Exception("test"));
}
}).forEach(new Action1<String>() {
@Override
public void call(String s) {
System.out.println(s);
}
});
}
}