From c2366d4dc46b61ec29d3f2bfbb3d094f2f128044 Mon Sep 17 00:00:00 2001 From: Dmitry Trofimov Date: Fri, 2 Oct 2015 01:02:56 +0200 Subject: [PATCH] Message can be null. --- .../com/intellij/execution/ExecutionHelper.java | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/execution/ExecutionHelper.java b/platform/lang-impl/src/com/intellij/execution/ExecutionHelper.java index e27d72707d75..94592406b54d 100644 --- a/platform/lang-impl/src/com/intellij/execution/ExecutionHelper.java +++ b/platform/lang-impl/src/com/intellij/execution/ExecutionHelper.java @@ -76,8 +76,7 @@ public class ExecutionHelper { @NotNull final Project myProject, @NotNull final List errors, @NotNull final String tabDisplayName, - @Nullable final VirtualFile file) - { + @Nullable final VirtualFile file) { showExceptions(myProject, errors, Collections.emptyList(), tabDisplayName, file); } @@ -86,8 +85,7 @@ public class ExecutionHelper { @NotNull final List errors, @NotNull final List warnings, @NotNull final String tabDisplayName, - @Nullable final VirtualFile file) - { + @Nullable final VirtualFile file) { if (ApplicationManager.getApplication().isUnitTestMode() && !errors.isEmpty()) { throw new RuntimeException(errors.get(0)); } @@ -133,12 +131,13 @@ public class ExecutionHelper { @NotNull final List exceptions, @NotNull ErrorViewPanel errorTreeView, @Nullable final VirtualFile file, - @NotNull final String defaultMessage) - { + @NotNull final String defaultMessage) { for (final Exception exception : exceptions) { - String[] messages = StringUtil.splitByLines(exception.getMessage()); + String message = exception.getMessage(); + + String[] messages = StringUtil.isNotEmpty(message) ? StringUtil.splitByLines(message) : ArrayUtil.EMPTY_STRING_ARRAY; if (messages.length == 0) { - messages = new String[] { defaultMessage }; + messages = new String[]{defaultMessage}; } errorTreeView.addMessage(messageCategory, messages, file, -1, -1, null); }