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 svn merge source details for commits without author

Browse Source 
IDEA-159659
This commit is contained in:
Konstantin Kolosovsky
2017-08-11 17:13:47 +03:00
parent 1c807ed415
commit 59071610e1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/src/org/jetbrains/idea/svn/history/SvnMergeSourceDetails.java
+3 -3
View File
@@ -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);
}
}