Skip to content

Commit 24ba020

Browse files
committed
Fix enhanced localizedMessage for Handled Exceptions
1 parent 5e1807c commit 24ba020

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.akaita.java.rxjava2debug;
1818

19+
import com.akaita.java.rxjava2debug.extensions.RxJavaAssemblyException;
1920
import io.reactivex.annotations.NonNull;
2021

2122
import java.util.LinkedList;
@@ -46,8 +47,12 @@ private static Throwable reverseAndCollapseCauses(@NonNull List<Throwable> cause
4647
return new RuntimeException("Empty list of causes");
4748
}
4849

49-
String originalEnhancedMessage = causes.get(causes.size() - 1).getLocalizedMessage();
50-
String topMessage = "caused by " + originalEnhancedMessage;
50+
String topMessage;
51+
if (causes.get(0) instanceof RxJavaAssemblyException) {
52+
topMessage = "caused by " + causes.get(causes.size() - 1).getLocalizedMessage();
53+
} else {
54+
topMessage = "caused by " + causes.get(0).getClass().getName() + ": " + causes.get(0).getLocalizedMessage();
55+
}
5156

5257
Throwable topThrowable = null;
5358
for (int i = causes.size() - 1; i >= 0; i--) {

0 commit comments

Comments
 (0)