diff options
author | Michael Valenta | 2003-08-20 18:03:03 +0000 |
---|---|---|
committer | Michael Valenta | 2003-08-20 18:03:03 +0000 |
commit | 63b88bc9a946faa24033d3fc9222e1c053a18a9b (patch) | |
tree | 1eda0af09f93419b09ad30025508bc3e0f49c5cb | |
parent | d2fa5999771e9955aaf05c8fbf41750d9a17fce2 (diff) | |
download | eclipse.platform.team-ConcurrentCommandsBranch.tar.gz eclipse.platform.team-ConcurrentCommandsBranch.tar.xz eclipse.platform.team-ConcurrentCommandsBranch.zip |
Fixed NPEConcurrentCommandsBranch
-rw-r--r-- | bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java | 4 |
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(); |