From 5bc787c1ea3f78760e2efa5e837e63e34e0cc7f2 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Mon, 26 Mar 2012 14:09:13 +0400
Subject: [PATCH] leak in SvnVcs

---
 .../src/org/jetbrains/idea/svn/SvnVcs.java      |  7 ++++++-
 .../jetbrains/idea/svn/dialogs/CopiesPanel.java | 17 ++++++++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java
index 3e25901512c5..50f35abf515b 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java
@@ -556,17 +556,22 @@ public class SvnVcs extends AbstractVcs<CommittedChangeList> {
   }
 
   private void createPool() {
+    if (myPool != null) return;
     final String property = System.getProperty(KEEP_CONNECTIONS_KEY);
     final boolean keep;
     if (StringUtil.isEmptyOrSpaces(property)) {
-      keep = ! ApplicationManager.getApplication().isUnitTestMode();  // default
+      keep = !ApplicationManager.getApplication().isUnitTestMode();  // default
     } else {
       keep = Boolean.getBoolean(KEEP_CONNECTIONS_KEY);
     }
     myPool = new DefaultSVNRepositoryPool(myConfiguration.getAuthenticationManager(this), myConfiguration.getOptions(myProject), 60*1000, keep);
   }
 
+  @NotNull
   private ISVNRepositoryPool getPool() {
+    if (myPool == null) {
+      createPool();
+    }
     return myPool;
   }
 
diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CopiesPanel.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CopiesPanel.java
index 1255ace19796..fd7c1b22761f 100644
--- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CopiesPanel.java
+++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CopiesPanel.java
@@ -86,18 +86,22 @@ public class CopiesPanel {
     myCurrentInfoList = null;
 
     final Runnable focus = new Runnable() {
+      @Override
       public void run() {
         IdeFocusManager.getInstance(myProject).requestFocus(myRefreshLabel, true);
       }
     };
     final Runnable refreshView = new Runnable() {
+      @Override
       public void run() {
         final List<WCInfo> infoList = myVcs.getAllWcInfos();
         Runnable runnable = new Runnable() {
+          @Override
           public void run() {
             if (myCurrentInfoList != null) {
               final List<OverrideEqualsWrapper<WCInfo>> newList =
                 ObjectsConvertor.convert(infoList, new Convertor<WCInfo, OverrideEqualsWrapper<WCInfo>>() {
+                  @Override
                   public OverrideEqualsWrapper<WCInfo> convert(WCInfo o) {
                     return new OverrideEqualsWrapper<WCInfo>(InfoEqualityPolicy.getInstance(), o);
                   }
@@ -119,8 +123,14 @@ public class CopiesPanel {
       }
     };
     final Runnable refreshOnPooled = new Runnable() {
+      @Override
       public void run() {
-        ApplicationManager.getApplication().executeOnPooledThread(refreshView);
+        if (ApplicationManager.getApplication().isUnitTestMode()) {
+          refreshView.run();
+        }
+        else {
+          ApplicationManager.getApplication().executeOnPooledThread(refreshView);
+        }
       }
     };
     myConnection.subscribe(SvnVcs.ROOTS_RELOADED, refreshOnPooled);
@@ -133,6 +143,7 @@ public class CopiesPanel {
     panel.add(myPanel, BorderLayout.NORTH);
     holderPanel.add(panel, BorderLayout.WEST);
     myRefreshLabel = new MyLinkLabel(myTextHeight, "Refresh", new LinkListener() {
+      @Override
       public void linkSelected(LinkLabel aSource, Object aLinkData) {
         if (myRefreshLabel.isEnabled()) {
           myVcs.invokeRefreshSvnRoots(true);
@@ -280,6 +291,7 @@ public class CopiesPanel {
 
   private void mergeFrom(final WCInfo wcInfo, final VirtualFile root, final Component mergeLabel) {
     SelectBranchPopup.showForBranchRoot(myProject, root, new SelectBranchPopup.BranchSelectedCallback() {
+      @Override
       public void branchSelected(Project project, SvnBranchConfigurationNew configuration, String url, long revision) {
         new QuickMerge(project, url, wcInfo, SVNPathUtil.tail(url), root).execute();
       }
@@ -393,6 +405,7 @@ public class CopiesPanel {
       }
     }
 
+    @Override
     public int getHashCode(WCInfo value) {
       final HashCodeBuilder builder = new HashCodeBuilder();
       builder.append(value.getPath());
@@ -404,6 +417,7 @@ public class CopiesPanel {
       return builder.getCode();
     }
 
+    @Override
     public boolean isEqual(WCInfo val1, WCInfo val2) {
       if (val1 == val2) return true;
       if (val1 == null || val2 == null || val1.getClass() != val2.getClass()) return false;
@@ -425,6 +439,7 @@ public class CopiesPanel {
       return ourComparator;
     }
 
+    @Override
     public int compare(WCInfo o1, WCInfo o2) {
       return o1.getPath().compareTo(o2.getPath());
     }