From 0d79a8f7fddbda3abbe2931baf49f63e19f0e25e Mon Sep 17 00:00:00 2001 From: irengrig Date: Fri, 29 Jan 2010 13:33:45 +0300 Subject: [PATCH] SVN: do not log process canceled exception --- .../jetbrains/idea/svn/SvnBranchConfigurationManager.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBranchConfigurationManager.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBranchConfigurationManager.java index bfdf5dc732..64853c0c76 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBranchConfigurationManager.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBranchConfigurationManager.java @@ -23,6 +23,7 @@ import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.components.State; import com.intellij.openapi.components.Storage; import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.Ref; @@ -206,10 +207,15 @@ public class SvnBranchConfigurationManager implements PersistentStateComponent pair : whatToInit) { - final BranchesPreloader branchesPreloader = new BranchesPreloader(myProject, myBunch, pair.getFirst()); - branchesPreloader.setAll(true); - branchesPreloader.loadImpl(null, pair.getSecond()); + try { + for (Pair pair : whatToInit) { + final BranchesPreloader branchesPreloader = new BranchesPreloader(myProject, myBunch, pair.getFirst()); + branchesPreloader.setAll(true); + branchesPreloader.loadImpl(null, pair.getSecond()); + } + } + catch (ProcessCanceledException e) { + // } } }); -- 2.11.4.GIT