From 2df9f55ee77385d729e67a45722906c1f4d66e62 Mon Sep 17 00:00:00 2001 From: Irina Chernushina Date: Wed, 18 Jun 2008 13:25:02 +0400 Subject: [PATCH] SVN: update dialog, NPE in branch field initialization --- .../src/org/jetbrains/idea/svn/update/SvnUpdateRootOptionsPanel.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnUpdateRootOptionsPanel.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnUpdateRootOptionsPanel.java index b5a664d842..c5bb651074 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnUpdateRootOptionsPanel.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/update/SvnUpdateRootOptionsPanel.java @@ -156,6 +156,9 @@ public class SvnUpdateRootOptionsPanel implements SvnPanel{ @Nullable private SVNURL getBranchForUrl(final String url) { final VirtualFile root = ProjectLevelVcsManager.getInstance(myVcs.getProject()).getVcsRootFor(myRoot); + if (root == null) { + return null; + } return SvnUtil.getBranchForUrl(myVcs, root, url); } -- 2.11.4.GIT