2.x: CompositeException fix order of Exceptions (#4695)

vanniktech · akarnokd · commit 35c29511c9b3 · 2016-10-12T11:35:31.000+02:00
* 2.x: CompositeException fix order of Exceptions

* Take out Completable classes
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -61,7 +61,7 @@ public void subscribeActual(Subscriber<? super T> 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -60,7 +60,7 @@ public void subscribeActual(Observer<? super T> 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);
                     }
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ public void onError(Throwable t) {`
`94`	`94`	`p = nextSupplier.apply(t);`
`95`	`95`	`} catch (Throwable e) {`
`96`	`96`	`Exceptions.throwIfFatal(e);`
`97`		`- actual.onError(new CompositeException(e, t));`
	`97`	`+ actual.onError(new CompositeException(t, e));`
`98`	`98`	`return;`
`99`	`99`	`}`
`100`	`100`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public void onError(Throwable t) {`
`85`	`85`	`} catch (Throwable e) {`
`86`	`86`	`Exceptions.throwIfFatal(e);`
`87`	`87`	`state.lazySet(HAS_REQUEST_HAS_VALUE);`
`88`		`- actual.onError(new CompositeException(e, t));`
	`88`	`+ actual.onError(new CompositeException(t, e));`
`89`	`89`	`return;`
`90`	`90`	`}`
`91`	`91`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public void onError(Throwable t) {`
`74`	`74`	`b = predicate.test(++retries, t);`
`75`	`75`	`} catch (Throwable e) {`
`76`	`76`	`Exceptions.throwIfFatal(e);`
`77`		`- actual.onError(new CompositeException(e, t));`
	`77`	`+ actual.onError(new CompositeException(t, e));`
`78`	`78`	`return;`
`79`	`79`	`}`
`80`	`80`	`if (!b) {`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public void onError(Throwable t) {`
`84`	`84`	`b = predicate.test(t);`
`85`	`85`	`} catch (Throwable e) {`
`86`	`86`	`Exceptions.throwIfFatal(e);`
`87`		`- actual.onError(new CompositeException(e, t));`
	`87`	`+ actual.onError(new CompositeException(t, e));`
`88`	`88`	`return;`
`89`	`89`	`}`
`90`	`90`	`if (!b) {`
Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ public void onError(Throwable t) {`
`194`	`194`	`predicate.test(null); // special case: poison pill`
`195`	`195`	`} catch (Throwable e) {`
`196`	`196`	`Exceptions.throwIfFatal(e);`
`197`		`- actual.onError(new CompositeException(e, t));`
	`197`	`+ actual.onError(new CompositeException(t, e));`
`198`	`198`	`return;`
`199`	`199`	`}`
`200`	`200`	`actual.onError(t);`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public void onError(Throwable t) {`
`91`	`91`	`p = nextSupplier.apply(t);`
`92`	`92`	`} catch (Throwable e) {`
`93`	`93`	`Exceptions.throwIfFatal(e);`
`94`		`- actual.onError(new CompositeException(e, t));`
	`94`	`+ actual.onError(new CompositeException(t, e));`
`95`	`95`	`return;`
`96`	`96`	`}`
`97`	`97`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public void onError(Throwable t) {`
`73`	`73`	`v = valueSupplier.apply(t);`
`74`	`74`	`} catch (Throwable e) {`
`75`	`75`	`Exceptions.throwIfFatal(e);`
`76`		`- actual.onError(new CompositeException(e, t));`
	`76`	`+ actual.onError(new CompositeException(t, e));`
`77`	`77`	`return;`
`78`	`78`	`}`
`79`	`79`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public void onError(Throwable t) {`
`72`	`72`	`b = predicate.test(++retries, t);`
`73`	`73`	`} catch (Throwable e) {`
`74`	`74`	`Exceptions.throwIfFatal(e);`
`75`		`- actual.onError(new CompositeException(e, t));`
	`75`	`+ actual.onError(new CompositeException(t, e));`
`76`	`76`	`return;`
`77`	`77`	`}`
`78`	`78`	`if (!b) {`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public void onError(Throwable t) {`
`82`	`82`	`b = predicate.test(t);`
`83`	`83`	`} catch (Throwable e) {`
`84`	`84`	`Exceptions.throwIfFatal(e);`
`85`		`- actual.onError(new CompositeException(e, t));`
	`85`	`+ actual.onError(new CompositeException(t, e));`
`86`	`86`	`return;`
`87`	`87`	`}`
`88`	`88`	`if (!b) {`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public void subscribeActual(Observer<? super T> s) {`
`60`	`60`	`disposer.accept(resource);`
`61`	`61`	`} catch (Throwable ex) {`
`62`	`62`	`Exceptions.throwIfFatal(ex);`
`63`		`- EmptyDisposable.error(new CompositeException(ex, e), s);`
	`63`	`+ EmptyDisposable.error(new CompositeException(e, ex), s);`
`64`	`64`	`return;`
`65`	`65`	`}`
`66`	`66`	`EmptyDisposable.error(e, s);`
`@@ -111,7 +111,7 @@ public void onError(Throwable t) {`
`111`	`111`	`disposer.accept(resource);`
`112`	`112`	`} catch (Throwable e) {`
`113`	`113`	`Exceptions.throwIfFatal(e);`
`114`		`- t = new CompositeException(e, t);`
	`114`	`+ t = new CompositeException(t, e);`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`