28679: Decoration not undated on project re-checkout

1 files changed, 5 insertions, 2 deletions

diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSWorkspaceRoot.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSWorkspaceRoot.java
index 76fd954b0..ac0397e7c 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSWorkspaceRoot.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/CVSWorkspaceRoot.java
@@ -461,7 +461,9 @@ public class CVSWorkspaceRoot {
 					// We do not want to delete the project to avoid a project deletion delta
 					// We do not want to delete the .project to avoid core exceptions
 					monitor.subTask(Policy.bind("CVSProvider.Scrubbing_local_project_1")); //$NON-NLS-1$
-					EclipseSynchronizer.getInstance().prepareForDeletion(project);
+					// unmap the project from any previous repository provider
+					if (RepositoryProvider.getProvider(project) != null)
+						RepositoryProvider.unmap(project);
 					IResource[] children = project.members(IContainer.INCLUDE_TEAM_PRIVATE_MEMBERS);
 					IProgressMonitor subMonitor = Policy.subMonitorFor(monitor, 80);
 					subMonitor.beginTask(null, children.length * 100);
@@ -474,7 +476,6 @@ public class CVSWorkspaceRoot {
 					} finally {
 						subMonitor.done();
 					}
-					CVSWorkspaceRoot.getCVSFolderFor(project).unmanage(Policy.subMonitorFor(monitor, 10));
 				} else if (project != null) {
 					// Make sure there is no directory in the local file system.
 					File location = new File(project.getParent().getLocation().toFile(), project.getName());
@@ -485,6 +486,8 @@ public class CVSWorkspaceRoot {
 			}
 		} catch (CoreException e) {
 			throw CVSException.wrapException(e);
+		} catch (TeamException e) {
+			throw CVSException.wrapException(e);
 		} finally {
 			monitor.done();
 		}