Review nullability of getEnhancedStackTrace's result

Author: akaita

rxjava2debug/src/main/java/com/akaita/java/rxjava2debug/ExceptionUtils.java

@@ -25,13 +25,6 @@
 class ExceptionUtils {
 
     static Throwable setRootCause(@NonNull Throwable throwable, @NonNull Throwable rootCause) {
-        if (throwable == null){
-            return null;
-        }
-        if (rootCause == null) {
-            return throwable;
-        }
-
         List<Throwable> causes = listCauses(throwable);
         causes.add(rootCause);
         return collapseCauses(causes);

rxjava2debug/src/main/java/com/akaita/java/rxjava2debug/RxJava2Debug.java

@@ -61,9 +61,9 @@ public static void disableRxJava2AssemblyTracking() {
     /**
      * Obtain a copy of the original Throwable with an extended StackTrace
      * @param original Original Throwable
-     * @return new Throwable with enhanced StackTrace if information was found. <i>null</i> otherwise
+     * @return new Throwable with enhanced StackTrace if information was found. <i>Original Throwable</i> otherwise
      */
-    public static @Nullable Throwable getEnhancedStackTrace(Throwable original) {
+    public static @NonNull Throwable getEnhancedStackTrace(@NonNull Throwable original) {
         Throwable enhanced = original;
 
         RxJavaAssemblyException assembledException = RxJavaAssemblyException.find(original);
@@ -86,12 +86,7 @@ private static void setRxJavaAssemblyHandler() {
             @Override
             public void uncaughtException(Thread t, Throwable e) {
                 Throwable enhancedStackTrace = getEnhancedStackTrace(e);
-
-                if (enhancedStackTrace != null) {
-                    previousDefaultHandler.uncaughtException(t, enhancedStackTrace);
-                } else {
-                    previousDefaultHandler.uncaughtException(t, e);
-                }
+                previousDefaultHandler.uncaughtException(t, enhancedStackTrace);
             }
         });
     }