Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2013-08-07 19:51:50 +0000
committerEike Stepper2013-08-10 09:44:23 +0000
commita33451d1572e41b67206ac58328232db60377a5e (patch)
tree6a2428f281459ab48ff6b3c4c71053c1e7997daa /plugins/org.eclipse.emf.cdo.server.db
parent02defe32410e41b300dac05f8835bb4307645c10 (diff)
downloadcdo-a33451d1572e41b67206ac58328232db60377a5e.tar.gz
cdo-a33451d1572e41b67206ac58328232db60377a5e.tar.xz
cdo-a33451d1572e41b67206ac58328232db60377a5e.zip
[405606] ClassCastException when using unchunked and restricted
CollectionLoadingPolicies https://bugs.eclipse.org/bugs/show_bug.cgi?id=405606 Change-Id: I81f5c551152a02285d2df69312def6089b7d069b
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.server.db')
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/META-INF/MANIFEST.MF16
-rw-r--r--plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalBranchingClassMapping.java2
2 files changed, 9 insertions, 9 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.db/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.db/META-INF/MANIFEST.MF
index ba0b3c3be8..935a0b0cc0 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.server.db/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.server.db;singleton:=true
-Bundle-Version: 4.2.0.qualifier
+Bundle-Version: 4.2.100.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -12,10 +12,10 @@ Bundle-ClassPath: .
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
org.eclipse.net4j.db;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
org.eclipse.emf.cdo.server;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.server.db;version="4.2.0",
- org.eclipse.emf.cdo.server.db.mapping;version="4.2.0",
- org.eclipse.emf.cdo.server.internal.db;version="4.2.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.tests.db",
- org.eclipse.emf.cdo.server.internal.db.bundle;version="4.2.0";x-internal:=true,
- org.eclipse.emf.cdo.server.internal.db.mapping;version="4.2.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.tests.db",
- org.eclipse.emf.cdo.server.internal.db.mapping.horizontal;version="4.2.0";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.tests.db",
- org.eclipse.emf.cdo.server.internal.db.messages;version="4.2.0";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.server.db;version="4.2.100",
+ org.eclipse.emf.cdo.server.db.mapping;version="4.2.100",
+ org.eclipse.emf.cdo.server.internal.db;version="4.2.100";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.tests.db",
+ org.eclipse.emf.cdo.server.internal.db.bundle;version="4.2.100";x-internal:=true,
+ org.eclipse.emf.cdo.server.internal.db.mapping;version="4.2.100";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.tests.db",
+ org.eclipse.emf.cdo.server.internal.db.mapping.horizontal;version="4.2.100";x-friends:="org.eclipse.emf.cdo.tests,org.eclipse.emf.cdo.tests.db",
+ org.eclipse.emf.cdo.server.internal.db.messages;version="4.2.100";x-internal:=true
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalBranchingClassMapping.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalBranchingClassMapping.java
index 13da4b20ad..5e90529832 100644
--- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalBranchingClassMapping.java
+++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/internal/db/mapping/horizontal/HorizontalBranchingClassMapping.java
@@ -1042,7 +1042,7 @@ public class HorizontalBranchingClassMapping extends AbstractHorizontalClassMapp
}
// Make sure all chunks are loaded
- repository.ensureChunks(oldRevision);
+ repository.ensureChunks(oldRevision, CDORevision.UNCHUNKED);
InternalCDORevision newRevision = oldRevision.copy();
newRevision.adjustForCommit(accessor.getTransaction().getBranch(), created);

Back to the top