1 files changed, 123 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.embedded/src/org/eclipse/emf/cdo/server/internal/embedded/ServerRevisionLoader.java b/plugins/org.eclipse.emf.cdo.server.embedded/src/org/eclipse/emf/cdo/server/internal/embedded/ServerRevisionLoader.java
new file mode 100644
index 0000000000..55040d393e
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.server.embedded/src/org/eclipse/emf/cdo/server/internal/embedded/ServerRevisionLoader.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2016 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ */
+package org.eclipse.emf.cdo.server.internal.embedded;
+
+import org.eclipse.emf.cdo.common.branch.CDOBranch;
+import org.eclipse.emf.cdo.common.branch.CDOBranchPoint;
+import org.eclipse.emf.cdo.common.branch.CDOBranchPointRange;
+import org.eclipse.emf.cdo.common.branch.CDOBranchVersion;
+import org.eclipse.emf.cdo.common.id.CDOID;
+import org.eclipse.emf.cdo.common.revision.CDORevisionHandler;
+import org.eclipse.emf.cdo.server.StoreThreadLocal;
+import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision;
+import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager.RevisionLoader2;
+import org.eclipse.emf.cdo.spi.common.revision.RevisionInfo;
+import org.eclipse.emf.cdo.spi.server.InternalSession;
+
+import org.eclipse.emf.ecore.EClass;
+
+import java.util.List;
+
+/**
+ * @author Eike Stepper
+ */
+public final class ServerRevisionLoader implements RevisionLoader2
+{
+  private final RevisionLoader2 delegate;
+
+  public ServerRevisionLoader(RevisionLoader2 delegate)
+  {
+    this.delegate = delegate;
+  }
+
+  public RevisionLoader2 getDelegate()
+  {
+    return delegate;
+  }
+
+  public List<RevisionInfo> loadRevisions(List<RevisionInfo> infos, CDOBranchPoint branchPoint, int referenceChunk, int prefetchDepth)
+  {
+    InternalSession serverSession = ServerSession.get();
+    if (serverSession != null)
+    {
+      try
+      {
+        StoreThreadLocal.setSession(serverSession);
+        return delegate.loadRevisions(infos, branchPoint, referenceChunk, prefetchDepth);
+      }
+      finally
+      {
+        StoreThreadLocal.release();
+      }
+    }
+
+    return delegate.loadRevisions(infos, branchPoint, referenceChunk, prefetchDepth);
+  }
+
+  public InternalCDORevision loadRevisionByVersion(CDOID id, CDOBranchVersion branchVersion, int referenceChunk)
+  {
+    InternalSession serverSession = ServerSession.get();
+    if (serverSession != null)
+    {
+      try
+      {
+        StoreThreadLocal.setSession(serverSession);
+        return delegate.loadRevisionByVersion(id, branchVersion, referenceChunk);
+      }
+      finally
+      {
+        StoreThreadLocal.release();
+      }
+    }
+
+    return delegate.loadRevisionByVersion(id, branchVersion, referenceChunk);
+  }
+
+  public void handleRevisions(EClass eClass, CDOBranch branch, boolean exactBranch, long timeStamp, boolean exactTime, CDORevisionHandler handler)
+  {
+    InternalSession serverSession = ServerSession.get();
+    if (serverSession != null)
+    {
+      try
+      {
+        StoreThreadLocal.setSession(serverSession);
+        delegate.handleRevisions(eClass, branch, exactBranch, timeStamp, exactTime, handler);
+      }
+      finally
+      {
+        StoreThreadLocal.release();
+      }
+    }
+    else
+    {
+      delegate.handleRevisions(eClass, branch, exactBranch, timeStamp, exactTime, handler);
+    }
+  }
+
+  public CDOBranchPointRange loadObjectLifetime(CDOID id, CDOBranchPoint branchPoint)
+  {
+    InternalSession serverSession = ServerSession.get();
+    if (serverSession != null)
+    {
+      try
+      {
+        StoreThreadLocal.setSession(serverSession);
+        return delegate.loadObjectLifetime(id, branchPoint);
+      }
+      finally
+      {
+        StoreThreadLocal.release();
+      }
+    }
+
+    return delegate.loadObjectLifetime(id, branchPoint);
+  }
+}