Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2004-05-12 20:11:00 +0000
committerMichael Valenta2004-05-12 20:11:00 +0000
commit68b57d5bfd851cd10563bfd815fdf1d6b19ed534 (patch)
tree041263223844875471890e5563efba7a69b352ef
parent8de247f8c9c75699bffc9890ed5544d83ef84c79 (diff)
downloadeclipse.platform.team-68b57d5bfd851cd10563bfd815fdf1d6b19ed534.tar.gz
eclipse.platform.team-68b57d5bfd851cd10563bfd815fdf1d6b19ed534.tar.xz
eclipse.platform.team-68b57d5bfd851cd10563bfd815fdf1d6b19ed534.zip
Fix to handle invalid sync bytes
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SynchronizerSyncInfoCache.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SynchronizerSyncInfoCache.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SynchronizerSyncInfoCache.java
index e1b6d6d37..500b482cb 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SynchronizerSyncInfoCache.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SynchronizerSyncInfoCache.java
@@ -23,6 +23,7 @@ import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.team.internal.ccvs.core.CVSException;
+import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin;
import org.eclipse.team.internal.ccvs.core.ICVSFolder;
import org.eclipse.team.internal.ccvs.core.ICVSResource;
import org.eclipse.team.internal.ccvs.core.syncinfo.FolderSyncInfo;
@@ -176,7 +177,12 @@ import org.eclipse.team.internal.ccvs.core.util.Util;
syncBytes = ResourceSyncInfo.convertToDeletion(syncBytes);
}
if (!ResourceSyncInfo.isFolder(oldBytes)) {
- oldBytes = ResourceSyncInfo.convertToDeletion(oldBytes);
+ try {
+ oldBytes = ResourceSyncInfo.convertToDeletion(oldBytes);
+ } catch (CVSException e) {
+ CVSProviderPlugin.log(e);
+ return false;
+ }
}
return Util.equals(syncBytes, oldBytes);
}

Back to the top