Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2006-06-13 18:50:29 +0000
committerMichael Valenta2006-06-13 18:50:29 +0000
commitea7312f255ae90d299187752d763980c1c9a3d2a (patch)
treec43756f4dfaee7244f0c6a6289c60ce52a329954 /bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources
parent19bb0e26fadc25a43767209a16c29ec91d4ca01d (diff)
downloadeclipse.platform.team-ea7312f255ae90d299187752d763980c1c9a3d2a.tar.gz
eclipse.platform.team-ea7312f255ae90d299187752d763980c1c9a3d2a.tar.xz
eclipse.platform.team-ea7312f255ae90d299187752d763980c1c9a3d2a.zip
Bug 140490 Problems while synchronizing
Diffstat (limited to 'bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources')
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/UpdateContentCachingService.java12
1 files changed, 9 insertions, 3 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/UpdateContentCachingService.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/UpdateContentCachingService.java
index f6d5aaf9c..3c63873ad 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/UpdateContentCachingService.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/UpdateContentCachingService.java
@@ -202,10 +202,9 @@ public class UpdateContentCachingService {
if ( ! e.isNoTagException() && e.containsErrors())
throw e;
return false;
- } else if (status.getSeverity() == IStatus.ERROR)
+ } else if (status.getSeverity() == IStatus.ERROR && isReportableError(status)) {
throw new CVSException(status);
- else
- CVSProviderPlugin.log (new CVSException(status));
+ }
}
} finally {
session.close();
@@ -214,6 +213,13 @@ public class UpdateContentCachingService {
return true;
}
+ private boolean isReportableError(IStatus status) {
+ return CVSStatus.isInternalError(status)
+ || status.getCode() == TeamException.UNABLE
+ || status.getCode() == CVSStatus.INVALID_LOCAL_RESOURCE_PATH
+ || status.getCode() == CVSStatus.RESPONSE_HANDLING_FAILURE;
+ }
+
private LocalOption[] getLocalOptions() {
ArrayList options = new ArrayList();
if (tag != null)

Back to the top