aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2018-06-01 00:58:47 -0400
committerEike Stepper2018-06-01 00:58:47 -0400
commit62c69ee2485b8a8972cdadd8f3f71765aa10c5fa (patch)
tree5c89b17961d35a25fe519911e4a253cba34ea59e
parent50b170cc24c35043465d9251ef0ab996c639b142 (diff)
downloadcdo-62c69ee2485b8a8972cdadd8f3f71765aa10c5fa.zip
cdo-62c69ee2485b8a8972cdadd8f3f71765aa10c5fa.tar.gz
cdo-62c69ee2485b8a8972cdadd8f3f71765aa10c5fa.tar.xz
[535395] "Unique index or primary key violation" with CDOMergingConflictResolver and a case of a CDORevisionDelta with an empty featureDeltasHEADmaster
https://bugs.eclipse.org/bugs/show_bug.cgi?id=535395
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverTest.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverTest.java
index 78baeb6..0411e6e 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverTest.java
@@ -191,7 +191,7 @@ public class ConflictResolverTest extends AbstractCDOTest
transaction1.options().addConflictResolver(createConflictResolver());
CDOResource resource1 = transaction1.getOrCreateResource(getResourcePath("/res1"));
EList<EObject> contents1 = resource1.getContents();
- // transaction1.commit();
+ transaction1.commit();
contents1.add(getModel1Factory().createAddress());
contents1.add(getModel1Factory().createAddress());