From 5326cb7d5281c46a0b57f423ae2ebfd791263c8d Mon Sep 17 00:00:00 2001
From: Konstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Date: Thu, 3 May 2018 22:31:18 +0300
Subject: [PATCH] svn: Fix null trunk url processing while reading branch
 configuration

IDEA-190935
---
 .../idea/svn/branchConfig/SvnBranchConfigurationManager.kt      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/branchConfig/SvnBranchConfigurationManager.kt b/plugins/svn4idea/src/org/jetbrains/idea/svn/branchConfig/SvnBranchConfigurationManager.kt
index d23569ec644b..6473b43a40da 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/branchConfig/SvnBranchConfigurationManager.kt
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/branchConfig/SvnBranchConfigurationManager.kt
@@ -124,7 +124,7 @@ class SvnBranchConfigurationManager(private val myProject: Project,
     else null
     val result = SvnBranchConfigurationNew().apply {
       // trunk url could be either decoded or encoded depending on the code flow
-      trunk = addUserInfo(persistedConfiguration.trunkUrl, true, userInfo)
+      trunk = persistedConfiguration.trunkUrl?.let { addUserInfo(it, true, userInfo) }
       isUserInfoInUrl = persistedConfiguration.isUserinfoInUrl
     }