Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2008-10-15 16:12:50 -0400
committerEike Stepper2008-10-15 16:12:50 -0400
commit4cc19933e3f022e5d28e1b8ec4e4fcb16cf35dbf (patch)
treee394e1654a940be9c99f4baf4adeda1c094fb073
parentc66eaef4ae5b96497f5df43c5724995b0514a808 (diff)
downloadcdo-4cc19933e3f022e5d28e1b8ec4e4fcb16cf35dbf.tar.gz
cdo-4cc19933e3f022e5d28e1b8ec4e4fcb16cf35dbf.tar.xz
cdo-4cc19933e3f022e5d28e1b8ec4e4fcb16cf35dbf.zip
[249847] Store resources in a hierarchical structure
https://bugs.eclipse.org/bugs/show_bug.cgi?id=249847
-rw-r--r--plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/MEMStore.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DetachTest.java6
2 files changed, 3 insertions, 4 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/MEMStore.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/MEMStore.java
index 1255b8ea30..747d43c9bf 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/MEMStore.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/MEMStore.java
@@ -269,7 +269,6 @@ public class MEMStore extends LongIDStore implements IMEMStore
if (revision != null)
{
CDOID revisionFolder = (CDOID)revision.getData().getContainerID();
- // TODO Don't use ObjectUtil.equals for CDOIDs
if (CDOIDUtil.equals(revisionFolder, folderID))
{
String revisionName = (String)revision.getData().get(getResourceNameFeature(), 0);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DetachTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DetachTest.java
index cbba8b81b6..4a795b64d6 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DetachTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/DetachTest.java
@@ -213,7 +213,7 @@ public class DetachTest extends AbstractCDOTest
orderDetail.setProduct(product1);
assertActive(resource);
Assert.assertEquals(1, CDOUtil.getViewSet(rset).getViews().length);
- Assert.assertEquals(1, rset.getResources().size());
+ Assert.assertEquals(2, rset.getResources().size());
if (commitBeforeDelete == true)
{
transaction.commit();
@@ -229,7 +229,7 @@ public class DetachTest extends AbstractCDOTest
assertTransient(product1);
assertEquals(1, CDOUtil.getViewSet(rset).getViews().length);
- assertEquals(0, rset.getResources().size());
+ assertEquals(1, rset.getResources().size());
assertEquals(2, resource.getContents().size());
assertEquals(true, resource.getContents().contains(order));
assertEquals(true, resource.getContents().contains(product1));
@@ -348,7 +348,7 @@ public class DetachTest extends AbstractCDOTest
}
}.timedOut();
- assertTrue(rSet1.getResources().size() == 0);
+ assertEquals(1, rSet1.getResources().size());
assertEquals(false, timedOut);
assertTransient(res);
assertInvalid(res2);

Back to the top