summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2008-04-20 14:37:55 (EDT)
committerEike Stepper2008-04-20 14:37:55 (EDT)
commitaff6b16d7ac493d273068eb6c59c17287372ac32 (patch)
tree43e0ed35530058417853ade555eeda7581eb4c24
parenta9123beccc02cd6707faba20e15ba8b65ccdb9de (diff)
downloadcdo-aff6b16d7ac493d273068eb6c59c17287372ac32.zip
cdo-aff6b16d7ac493d273068eb6c59c17287372ac32.tar.gz
cdo-aff6b16d7ac493d273068eb6c59c17287372ac32.tar.bz2
[226233] Issues with EPackages having inter-dependencies
https://bugs.eclipse.org/bugs/show_bug.cgi?id=226233
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java1
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java2
2 files changed, 2 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java
index 9b8d932..6fc634a 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java
@@ -132,6 +132,7 @@ public class PackageRegistryTest extends AbstractCDOTest
{
CDOSession session = CDOUtil.openSession(getConnector(), REPOSITORY_NAME, true);
session.getPackageRegistry().putEPackage(Model3Package.eINSTANCE);
+ assertEquals(2, session.getPackageRegistry().size());
try
{
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java
index 6e3c2c6..5727c8e 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java
@@ -426,7 +426,7 @@ public class CDOSessionImpl extends Container<CDOView> implements CDOSession, CD
range = registerMetaInstance((InternalEObject)ePackage, range);
if (range.size() != metaIDRange.size())
{
- throw new IllegalStateException("range.getCount() != metaIDRange.getCount()");
+ throw new IllegalStateException("range.size() != metaIDRange.size()");
}
}