diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableOnErrorNext.java b/src/main/java/io/reactivex/internal/operators/flowable/FlowableOnErrorNext.java index 7f896a8850..e8d3b2b11c 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableOnErrorNext.java +++ b/src/main/java/io/reactivex/internal/operators/flowable/FlowableOnErrorNext.java @@ -94,7 +94,7 @@ public void onError(Throwable t) { p = nextSupplier.apply(t); } catch (Throwable e) { Exceptions.throwIfFatal(e); - actual.onError(new CompositeException(e, t)); + actual.onError(new CompositeException(t, e)); return; } diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableOnErrorReturn.java b/src/main/java/io/reactivex/internal/operators/flowable/FlowableOnErrorReturn.java index 02e24f0823..dc7cb90b6d 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableOnErrorReturn.java +++ b/src/main/java/io/reactivex/internal/operators/flowable/FlowableOnErrorReturn.java @@ -85,7 +85,7 @@ public void onError(Throwable t) { } catch (Throwable e) { Exceptions.throwIfFatal(e); state.lazySet(HAS_REQUEST_HAS_VALUE); - actual.onError(new CompositeException(e, t)); + actual.onError(new CompositeException(t, e)); return; } diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableRetryBiPredicate.java b/src/main/java/io/reactivex/internal/operators/flowable/FlowableRetryBiPredicate.java index 1da6d9f79b..043d950fc3 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableRetryBiPredicate.java +++ b/src/main/java/io/reactivex/internal/operators/flowable/FlowableRetryBiPredicate.java @@ -74,7 +74,7 @@ public void onError(Throwable t) { b = predicate.test(++retries, t); } catch (Throwable e) { Exceptions.throwIfFatal(e); - actual.onError(new CompositeException(e, t)); + actual.onError(new CompositeException(t, e)); return; } if (!b) { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableRetryPredicate.java b/src/main/java/io/reactivex/internal/operators/flowable/FlowableRetryPredicate.java index 2c65e0c03d..100e11093f 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableRetryPredicate.java +++ b/src/main/java/io/reactivex/internal/operators/flowable/FlowableRetryPredicate.java @@ -84,7 +84,7 @@ public void onError(Throwable t) { b = predicate.test(t); } catch (Throwable e) { Exceptions.throwIfFatal(e); - actual.onError(new CompositeException(e, t)); + actual.onError(new CompositeException(t, e)); return; } if (!b) { diff --git a/src/main/java/io/reactivex/internal/operators/flowable/FlowableUsing.java b/src/main/java/io/reactivex/internal/operators/flowable/FlowableUsing.java index b8bfa6d7df..4532085c07 100644 --- a/src/main/java/io/reactivex/internal/operators/flowable/FlowableUsing.java +++ b/src/main/java/io/reactivex/internal/operators/flowable/FlowableUsing.java @@ -61,7 +61,7 @@ public void subscribeActual(Subscriber s) { disposer.accept(resource); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); - EmptySubscription.error(new CompositeException(ex, e), s); + EmptySubscription.error(new CompositeException(e, ex), s); return; } EmptySubscription.error(e, s); @@ -119,7 +119,7 @@ public void onError(Throwable t) { s.cancel(); if (innerError != null) { - actual.onError(new CompositeException(innerError, t)); + actual.onError(new CompositeException(t, innerError)); } else { actual.onError(t); } diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableDistinct.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableDistinct.java index dde1d3c9b0..d1317f14ff 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableDistinct.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableDistinct.java @@ -194,7 +194,7 @@ public void onError(Throwable t) { predicate.test(null); // special case: poison pill } catch (Throwable e) { Exceptions.throwIfFatal(e); - actual.onError(new CompositeException(e, t)); + actual.onError(new CompositeException(t, e)); return; } actual.onError(t); diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableOnErrorNext.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableOnErrorNext.java index 37ec7bd880..de7a1330bc 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableOnErrorNext.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableOnErrorNext.java @@ -91,7 +91,7 @@ public void onError(Throwable t) { p = nextSupplier.apply(t); } catch (Throwable e) { Exceptions.throwIfFatal(e); - actual.onError(new CompositeException(e, t)); + actual.onError(new CompositeException(t, e)); return; } diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableOnErrorReturn.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableOnErrorReturn.java index 9f5cc8bd0d..6599f719d0 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableOnErrorReturn.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableOnErrorReturn.java @@ -73,7 +73,7 @@ public void onError(Throwable t) { v = valueSupplier.apply(t); } catch (Throwable e) { Exceptions.throwIfFatal(e); - actual.onError(new CompositeException(e, t)); + actual.onError(new CompositeException(t, e)); return; } diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableRetryBiPredicate.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableRetryBiPredicate.java index 18ab3e5f6b..14fae28b94 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableRetryBiPredicate.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableRetryBiPredicate.java @@ -72,7 +72,7 @@ public void onError(Throwable t) { b = predicate.test(++retries, t); } catch (Throwable e) { Exceptions.throwIfFatal(e); - actual.onError(new CompositeException(e, t)); + actual.onError(new CompositeException(t, e)); return; } if (!b) { diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableRetryPredicate.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableRetryPredicate.java index db9870e45e..c4fc1a7a3d 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableRetryPredicate.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableRetryPredicate.java @@ -82,7 +82,7 @@ public void onError(Throwable t) { b = predicate.test(t); } catch (Throwable e) { Exceptions.throwIfFatal(e); - actual.onError(new CompositeException(e, t)); + actual.onError(new CompositeException(t, e)); return; } if (!b) { diff --git a/src/main/java/io/reactivex/internal/operators/observable/ObservableUsing.java b/src/main/java/io/reactivex/internal/operators/observable/ObservableUsing.java index 62724f23b6..9e38818244 100644 --- a/src/main/java/io/reactivex/internal/operators/observable/ObservableUsing.java +++ b/src/main/java/io/reactivex/internal/operators/observable/ObservableUsing.java @@ -60,7 +60,7 @@ public void subscribeActual(Observer s) { disposer.accept(resource); } catch (Throwable ex) { Exceptions.throwIfFatal(ex); - EmptyDisposable.error(new CompositeException(ex, e), s); + EmptyDisposable.error(new CompositeException(e, ex), s); return; } EmptyDisposable.error(e, s); @@ -111,7 +111,7 @@ public void onError(Throwable t) { disposer.accept(resource); } catch (Throwable e) { Exceptions.throwIfFatal(e); - t = new CompositeException(e, t); + t = new CompositeException(t, e); } }