Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2017-01-13 07:41:44 +0000
committerEike Stepper2017-01-13 08:18:31 +0000
commit226fddd44f9b402b4c2330ce32c469cdc71a61dd (patch)
tree12850a5dd1e3734ff8b17dd5413ddfdf48b6e8e6 /plugins/org.eclipse.emf.cdo.tests.db4o
parentbb6dacda5af21995d9632c1ec9444e7d5e2a63c5 (diff)
downloadcdo-226fddd44f9b402b4c2330ce32c469cdc71a61dd.tar.gz
cdo-226fddd44f9b402b4c2330ce32c469cdc71a61dd.tar.xz
cdo-226fddd44f9b402b4c2330ce32c469cdc71a61dd.zip
[510412] DefaultCDOMerger produces incorrect results for MOVE deltas in many-valued features
https://bugs.eclipse.org/bugs/show_bug.cgi?id=510412
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests.db4o')
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db4o/META-INF/MANIFEST.MF4
-rw-r--r--plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/DB4OConfig.java3
2 files changed, 3 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests.db4o/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.db4o/META-INF/MANIFEST.MF
index cc0d9d342a..e7f9a8b3a0 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db4o/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.db4o/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.cdo.tests.db4o
-Bundle-Version: 4.0.500.qualifier
+Bundle-Version: 4.0.600.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.emf.cdo.tests;bundle-version="[4.0.0,5.0.0)",
org.eclipse.emf.cdo.server.db4o;bundle-version="[4.0.0,5.0.0)"
Bundle-Vendor: %providerName
-Export-Package: org.eclipse.emf.cdo.tests.db4o;version="4.0.500";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.tests.db4o;version="4.0.600";x-internal:=true
Bundle-Localization: plugin
Import-Package: com.db4o;version="[7.4.0,9.0.0)",
com.db4o.ext;version="[7.4.0,9.0.0)"
diff --git a/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/DB4OConfig.java b/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/DB4OConfig.java
index f871ea0973..1d4cc31a77 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/DB4OConfig.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db4o/src/org/eclipse/emf/cdo/tests/db4o/DB4OConfig.java
@@ -10,7 +10,6 @@
*/
package org.eclipse.emf.cdo.tests.db4o;
-import org.eclipse.emf.cdo.common.CDOCommonRepository.IDGenerationLocation;
import org.eclipse.emf.cdo.server.IStore;
import org.eclipse.emf.cdo.server.internal.db4o.DB4OStore;
import org.eclipse.emf.cdo.tests.config.impl.RepositoryConfig;
@@ -42,7 +41,7 @@ public class DB4OConfig extends RepositoryConfig
public DB4OConfig(boolean mem)
{
- super("DB4O-" + (mem ? "mem" : "net"), false, false, IDGenerationLocation.STORE);
+ super("DB4O-" + (mem ? "mem" : "net"));
this.mem = mem;
}

Back to the top