summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-11-14 05:59:01 (EST)
committerEike Stepper2007-11-14 05:59:01 (EST)
commitfbe57cba7392c42ad8e38aa6b05555bf0ae7b65b (patch)
tree784d7df0ba1859956f93dc7f481a64b9bc047039
parent84918dcb013f5c44f3bc32cf1f7cd10d63650361 (diff)
downloadcdo-fbe57cba7392c42ad8e38aa6b05555bf0ae7b65b.zip
cdo-fbe57cba7392c42ad8e38aa6b05555bf0ae7b65b.tar.gz
cdo-fbe57cba7392c42ad8e38aa6b05555bf0ae7b65b.tar.bz2
[209773] Duplicate version error in prefetch
https://bugs.eclipse.org/bugs/show_bug.cgi?id=209773
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionRequest.java15
1 files changed, 13 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionRequest.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionRequest.java
index fa465d6..1467c84 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionRequest.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/protocol/LoadRevisionRequest.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.cdo.internal.protocol.revision.CDORevisionImpl;
import org.eclipse.emf.cdo.protocol.CDOID;
import org.eclipse.emf.cdo.protocol.CDOProtocolConstants;
import org.eclipse.emf.cdo.protocol.analyzer.CDOFetchRule;
+import org.eclipse.emf.cdo.protocol.revision.CDODuplicateRevisionException;
import org.eclipse.emf.internal.cdo.CDORevisionManagerImpl;
import org.eclipse.emf.internal.cdo.CDOSessionImpl;
@@ -121,8 +122,18 @@ public class LoadRevisionRequest extends CDOClientRequest<List<CDORevisionImpl>>
if (PROTOCOL.isEnabled()) PROTOCOL.format("Reading {0} additional revisions", size);
for (int i = 0; i < size; i++)
{
- CDORevisionImpl revision = new CDORevisionImpl(in, revisionManager, packageManager);
- revisionManager.addRevision(revision);
+ try
+ {
+ CDORevisionImpl revision = new CDORevisionImpl(in, revisionManager, packageManager);
+ revisionManager.addRevision(revision);
+ }
+ catch (CDODuplicateRevisionException ex)
+ {
+ if (PROTOCOL.isEnabled())
+ {
+ PROTOCOL.trace(ex);
+ }
+ }
}
}