svn: Fixed "TreeConflictRefreshablePanel" disposing
authorKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Tue, 8 Nov 2016 20:22:33 +0000 (23:22 +0300)
committerKonstantin Kolosovsky <konstantin.kolosovsky@jetbrains.com>
Wed, 16 Nov 2016 18:01:56 +0000 (21:01 +0300)
plugins/svn4idea/src/org/jetbrains/idea/svn/difftool/SvnTreeConflictDiffRequestProvider.java

index e981eb9375da9d412ca64efa05d01c43e1dd1a87..bd126b324c6020cd0fa109dc78d49306402b80eb 100644 (file)
@@ -1,14 +1,15 @@
 package org.jetbrains.idea.svn.difftool;
 
+import com.intellij.diff.DiffContext;
+import com.intellij.diff.FrameDiffTool;
+import com.intellij.diff.chains.DiffRequestProducerException;
+import com.intellij.diff.requests.DiffRequest;
 import com.intellij.openapi.progress.BackgroundTaskQueue;
 import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.UserDataHolder;
-import com.intellij.diff.DiffContext;
-import com.intellij.diff.FrameDiffTool;
-import com.intellij.diff.chains.DiffRequestProducerException;
-import com.intellij.diff.requests.DiffRequest;
 import com.intellij.openapi.vcs.changes.Change;
 import com.intellij.openapi.vcs.changes.actions.diff.ChangeDiffRequestProducer;
 import com.intellij.openapi.vcs.changes.actions.diff.ChangeDiffRequestProvider;
@@ -131,6 +132,7 @@ public class SvnTreeConflictDiffRequestProvider implements ChangeDiffRequestProv
     @Override
     public void dispose() {
       myQueue.clear();
+      Disposer.dispose(myDelegate);
     }
   }
 }