MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix NPE in DefaultLogger.attachmentsToString

Browse Source
This commit is contained in:
peter
2016-05-11 16:58:28 +02:00
parent f58d9f5144
commit 956a51036d
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/util/src/com/intellij/openapi/diagnostic/DefaultLogger.java
+2 -2
View File
@@ -77,9 +77,9 @@ public class DefaultLogger extends Logger {
@Override
public void setLevel(Level level) { }
public static String attachmentsToString(Throwable t) {
public static String attachmentsToString(@Nullable Throwable t) {
//noinspection ThrowableResultOfMethodCallIgnored
Throwable rootCause = ExceptionUtil.getRootCause(t);
Throwable rootCause = t == null ? null : ExceptionUtil.getRootCause(t);
if (rootCause instanceof ExceptionWithAttachments) {
return "\nAttachments:" + StringUtil.join(((ExceptionWithAttachments)rootCause).getAttachments(),
new Function<Attachment, String>() {
platform/util/src/com/intellij/util/ExceptionUtil.java
+2 -1
View File
@@ -27,7 +27,8 @@ import java.util.Arrays;
public class ExceptionUtil {
private ExceptionUtil() { }
public static Throwable getRootCause(Throwable e) {
@NotNull
public static Throwable getRootCause(@NotNull Throwable e) {
while (true) {
if (e.getCause() == null) return e;
e = e.getCause();