[282481] Provide an EmbeddedSessionProtocol

https://bugs.eclipse.org/bugs/show_bug.cgi?id=282481

4 files changed, 6 insertions, 6 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChunkingWithMEMTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChunkingWithMEMTest.java
index 1ca2d91ed7..caca7b81fc 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChunkingWithMEMTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ChunkingWithMEMTest.java
@@ -63,7 +63,7 @@ public class ChunkingWithMEMTest extends AbstractCDOTest
     }
 
     InternalCDORevisionManager revisionManager = getRepository().getRevisionManager();
-    revisionManager.removeCachedRevision(revisionToRemove);
+    revisionManager.getCache().removeRevision(revisionToRemove);
 
     msg("Opening session");
     CDOSession session = openModel1Session();
@@ -122,7 +122,7 @@ public class ChunkingWithMEMTest extends AbstractCDOTest
     }
 
     InternalCDORevisionManager revisionManager = getRepository().getRevisionManager();
-    revisionManager.removeCachedRevision(revisionToRemove);
+    revisionManager.getCache().removeRevision(revisionToRemove);
 
     msg("Opening session");
     CDOSession session = openModel1Session();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InvalidationTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InvalidationTest.java
index 3c15be3fe3..ac8ab6226d 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InvalidationTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/InvalidationTest.java
@@ -913,8 +913,8 @@ public class InvalidationTest extends AbstractCDOTest
     if (isRemoveRevision)
     {
       clearCache(getRepository().getRevisionManager());
-      getRepository().getRevisionManager().removeCachedRevision(resourceA.cdoID(), 1);
-      getRepository().getRevisionManager().removeCachedRevision(resourceA.cdoID(), 2);
+      getRepository().getRevisionManager().getCache().removeRevision(resourceA.cdoID(), 1);
+      getRepository().getRevisionManager().getCache().removeRevision(resourceA.cdoID(), 2);
     }
 
     msg("Checking after commit");
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaTest.java
index 2cb0eb1cec..2e4cfe9f2f 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RevisionDeltaTest.java
@@ -205,7 +205,7 @@ public abstract class RevisionDeltaTest extends AbstractCDOTest
 
     InternalCDORevisionManager revisionManager = getRepository().getRevisionManager();
     CDORevision revision = CDOUtil.getCDOObject(customer).cdoRevision();
-    revisionManager.removeCachedRevision(revision.getID(), revision.getVersion());
+    revisionManager.getCache().removeRevision(revision.getID(), revision.getVersion());
 
     SalesOrder salesOrder = getModel1Factory().createSalesOrder();
     resource.getContents().add(salesOrder);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273233_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273233_Test.java
index ce3f69351f..6986bbd391 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273233_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_273233_Test.java
@@ -102,7 +102,7 @@ public class Bugzilla_273233_Test extends AbstractCDOTest
     res2.getContents().add(company2);
 
     trans.commit();
-    session2.getRevisionManager().getCache().clear();
+    clearCache(session2.getRevisionManager());
     assertFalse(FSMUtil.isConflict(res2));
     session2.refresh();
     assertTrue(FSMUtil.isConflict(res2));