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

svn: Fixed NPE when adding new branch location

Browse Source
This commit is contained in:
Konstantin Kolosovsky
2017-01-13 15:23:38 +03:00
parent d3565f56f1
commit 3b0a9f0286
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/svn4idea/src/org/jetbrains/idea/svn/branchConfig/BranchConfigurationDialog.java
+5 -5
View File
@@ -107,13 +107,13 @@ public class BranchConfigurationDialog extends DialogWrapper {
public void run(AnActionButton button) {
Pair<SVNURL, SVNURL> result = SelectLocationDialog.selectLocation(project, ObjectUtils.notNull(usedRootUrl, rootUrl));
if (result != null) {
String selectedUrl = result.getFirst().toString();
SVNURL selectedUrl = result.getFirst();
usedRootUrl = result.getSecond();
if (selectedUrl != null) {
if (!configuration.getBranchUrls().contains(selectedUrl)) {
configuration
.addBranches(selectedUrl, new InfoStorage<>(new ArrayList<>(), InfoReliability.empty));
mySvnBranchConfigManager.reloadBranchesAsync(myRoot, selectedUrl, InfoReliability.setByUser);
String selectedUrlValue = selectedUrl.toString();
if (!configuration.getBranchUrls().contains(selectedUrlValue)) {
configuration.addBranches(selectedUrlValue, new InfoStorage<>(new ArrayList<>(), InfoReliability.empty));
mySvnBranchConfigManager.reloadBranchesAsync(myRoot, selectedUrlValue, InfoReliability.setByUser);
listModel.fireItemAdded();
myLocationList.setSelectedIndex(listModel.getSize() - 1);
}