From 62c69ee2485b8a8972cdadd8f3f71765aa10c5fa Mon Sep 17 00:00:00 2001
From: Eike Stepper
Date: Fri, 1 Jun 2018 06:58:47 +0200
Subject: [535395] "Unique index or primary key violation" with
 CDOMergingConflictResolver and a case of a CDORevisionDelta with an empty
 featureDeltas

https://bugs.eclipse.org/bugs/show_bug.cgi?id=535395
---
 .../src/org/eclipse/emf/cdo/tests/ConflictResolverTest.java             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/org.eclipse.emf.cdo.tests/src')

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 78baeb647c..0411e6e581 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());
 
-- 
cgit v1.2.3