From 59071610e1aafae2eb0714f7012d4fbf4a7ef68f Mon Sep 17 00:00:00 2001 From: Konstantin Kolosovsky Date: Tue, 1 Aug 2017 16:35:36 +0300 Subject: [PATCH] Fix NPE in svn merge source details for commits without author IDEA-159659 --- .../jetbrains/idea/svn/history/SvnMergeSourceDetails.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnMergeSourceDetails.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnMergeSourceDetails.java index 55c227eee864..e4642a33678f 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnMergeSourceDetails.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnMergeSourceDetails.java @@ -50,6 +50,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import static com.intellij.openapi.util.text.StringUtil.notNullize; + public class SvnMergeSourceDetails extends MasterDetailsComponent { private final Project myProject; private final SvnFileRevision myRevision; @@ -150,11 +152,9 @@ public class SvnMergeSourceDetails extends MasterDetailsComponent { final String date = CommittedChangeListRenderer.getDateOfChangeList(revision.getRevisionDate()); - final String author = revision.getAuthor(); - append(revisonNumber + " ", SimpleTextAttributes.REGULAR_BOLD_ATTRIBUTES); append(description + " ", SimpleTextAttributes.REGULAR_ATTRIBUTES); - append(author, SimpleTextAttributes.REGULAR_BOLD_ATTRIBUTES); + append(notNullize(revision.getAuthor()), SimpleTextAttributes.REGULAR_BOLD_ATTRIBUTES); append(", " + date, SimpleTextAttributes.REGULAR_ATTRIBUTES); } }