| commit | 63b88bc9a946faa24033d3fc9222e1c053a18a9b | [log] [tgz] |
|---|---|---|
| author | Michael Valenta <mvalenta> | Wed Aug 20 18:03:03 2003 +0000 |
| committer | Michael Valenta <mvalenta> | Wed Aug 20 18:03:03 2003 +0000 |
| tree | 1eda0af09f93419b09ad30025508bc3e0f49c5cb | |
| parent | d2fa5999771e9955aaf05c8fbf41750d9a17fce2 [diff] |
Fixed NPE
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 9e651c0..e62c0e7 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 @@ * @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();