43592: Synch view throws a large amount of errors due to out of synch resources

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;