Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2003-08-20 14:03:03 -0400
committerMichael Valenta2003-08-20 14:03:03 -0400
commit63b88bc9a946faa24033d3fc9222e1c053a18a9b (patch)
tree1eda0af09f93419b09ad30025508bc3e0f49c5cb
parentd2fa5999771e9955aaf05c8fbf41750d9a17fce2 (diff)
downloadeclipse.platform.team-ConcurrentCommandsBranch.tar.gz
eclipse.platform.team-ConcurrentCommandsBranch.tar.xz
eclipse.platform.team-ConcurrentCommandsBranch.zip
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java
index 9e651c008..e62c0e7a2 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java
@@ -141,8 +141,8 @@ public class CVSMergeSubscriber extends CVSSyncTreeSubscriber implements IResour
* @see org.eclipse.team.core.sync.TeamSubscriber#cancel()
*/
public void cancel() {
- super.cancel();
- ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
+ super.cancel();
+ ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
TeamProvider.deregisterSubscriber(this);
remoteSynchronizer.dispose();
baseSynchronizer.dispose();

Back to the top