Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2010-04-22 07:45:14 +0000
committerEike Stepper2010-04-22 07:45:14 +0000
commit57097d6c7f190f9d5e10627d56dc060b5345d26c (patch)
treeeb8743c5cc8c4dc844b6967db1d3f2b4dd5bd881
parente22dbedc962df2c94472651369f9f02603c76b1b (diff)
downloadcdo-57097d6c7f190f9d5e10627d56dc060b5345d26c.tar.gz
cdo-57097d6c7f190f9d5e10627d56dc060b5345d26c.tar.xz
cdo-57097d6c7f190f9d5e10627d56dc060b5345d26c.zip
[256936] Support for Offline Mode
https://bugs.eclipse.org/bugs/show_bug.cgi?id=256936
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionConfigurationImpl.java20
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSessionConfiguration.java5
2 files changed, 25 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionConfigurationImpl.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionConfigurationImpl.java
index c34adc0042..8b2019ccbf 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionConfigurationImpl.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/CDONet4jSessionConfigurationImpl.java
@@ -37,6 +37,7 @@ import org.eclipse.net4j.connector.IConnector;
import org.eclipse.net4j.signal.failover.IFailOverStrategy;
import org.eclipse.net4j.signal.failover.NOOPFailOverStrategy;
import org.eclipse.net4j.util.CheckUtil;
+import org.eclipse.net4j.util.io.IStreamWrapper;
import org.eclipse.emf.ecore.EcorePackage;
import org.eclipse.emf.spi.cdo.CDOSessionProtocol.OpenSessionResult;
@@ -57,6 +58,8 @@ public class CDONet4jSessionConfigurationImpl extends CDOSessionConfigurationImp
private IFailOverStrategy failOverStrategy;
+ private IStreamWrapper streamWrapper;
+
private InternalCDOBranchManager branchManager;
private InternalCDOPackageRegistry packageRegistry;
@@ -102,6 +105,17 @@ public class CDONet4jSessionConfigurationImpl extends CDOSessionConfigurationImp
this.failOverStrategy = failOverStrategy;
}
+ public IStreamWrapper getStreamWrapper()
+ {
+ return streamWrapper;
+ }
+
+ public void setStreamWrapper(IStreamWrapper streamWrapper)
+ {
+ checkNotOpen();
+ this.streamWrapper = streamWrapper;
+ }
+
public InternalCDOBranchManager getBranchManager()
{
return branchManager;
@@ -181,8 +195,14 @@ public class CDONet4jSessionConfigurationImpl extends CDOSessionConfigurationImp
public void activateSession(InternalCDOSession session) throws Exception
{
super.activateSession(session);
+
CDOClientProtocol protocol = new CDOClientProtocol();
protocol.setInfraStructure(session);
+ if (streamWrapper != null)
+ {
+ protocol.setStreamWrapper(streamWrapper);
+ }
+
session.setSessionProtocol(protocol);
if (connector != null)
{
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSessionConfiguration.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSessionConfiguration.java
index 61d0ff25f6..9d8eaf36d3 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSessionConfiguration.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/net4j/CDOSessionConfiguration.java
@@ -16,6 +16,7 @@ import org.eclipse.emf.cdo.common.revision.CDORevisionManager;
import org.eclipse.net4j.connector.IConnector;
import org.eclipse.net4j.signal.failover.IFailOverStrategy;
+import org.eclipse.net4j.util.io.IStreamWrapper;
/**
* @author Eike Stepper
@@ -39,6 +40,10 @@ public interface CDOSessionConfiguration extends org.eclipse.emf.cdo.session.CDO
*/
public void setFailOverStrategy(IFailOverStrategy failOverStrategy);
+ public IStreamWrapper getStreamWrapper();
+
+ public void setStreamWrapper(IStreamWrapper streamWrapper);
+
/**
* @see CDOSession#getPackageRegistry()
*/

Back to the top