Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2003-09-25 15:27:43 +0000
committerMichael Valenta2003-09-25 15:27:43 +0000
commitba8810f3ff58a67362e092a95d3d24111f7def8c (patch)
tree1039d234541caa371e5d009025f7f1007480270e
parent5bbd294801f7fee984ee3f16297a13b866d479b8 (diff)
downloadeclipse.platform.team-ba8810f3ff58a67362e092a95d3d24111f7def8c.tar.gz
eclipse.platform.team-ba8810f3ff58a67362e092a95d3d24111f7def8c.tar.xz
eclipse.platform.team-ba8810f3ff58a67362e092a95d3d24111f7def8c.zip
43592: Synch view throws a large amount of errors due to out of synch resources
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseSynchronizer.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseSynchronizer.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseSynchronizer.java
index d13a2e72b..84370b5fa 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseSynchronizer.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseSynchronizer.java
@@ -109,7 +109,7 @@ public class EclipseSynchronizer implements IFlushOperation {
}
public SyncInfoCache getSyncInfoCacheFor(IResource resource) {
- if (resource.exists()) {
+ if (resource.exists() && resource.isLocal(IResource.DEPTH_ZERO)) {
return sessionPropertyCache;
} else {
return synchronizerCache;
@@ -282,7 +282,7 @@ public class EclipseSynchronizer implements IFlushOperation {
if (isCannotModifySynchronizer(e)) {
// We will resort to loading the sync info for the requested resource from disk
byte[] bytes = getSyncBytesFromDisk(resource);
- if (!resource.exists() && !ResourceSyncInfo.isDeletion(bytes)) {
+ if (!resource.exists() && bytes != null && !ResourceSyncInfo.isDeletion(bytes)) {
bytes = ResourceSyncInfo.convertToDeletion(bytes);
}
return bytes;

Back to the top