summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-08-29 10:55:01 (EDT)
committerEike Stepper2007-08-29 10:55:01 (EDT)
commit55c18634fd1997c7d89711360f3f252bea42b585 (patch)
tree504bf788df7981c24409fb442aa765c7c151a801
parentbce5eb47eef0b3810137fa1fb9675ed72658a4b0 (diff)
downloadcdo-55c18634fd1997c7d89711360f3f252bea42b585.zip
cdo-55c18634fd1997c7d89711360f3f252bea42b585.tar.gz
cdo-55c18634fd1997c7d89711360f3f252bea42b585.tar.bz2
[201267] failover strategy for CDO/NET4J
https://bugs.eclipse.org/bugs/show_bug.cgi?id=201267
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSession.java3
-rw-r--r--plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/CDOSessionImpl.java2
2 files changed, 5 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSession.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSession.java
index 3e08a98..75ff94e 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSession.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/cdo/CDOSession.java
@@ -14,6 +14,7 @@ import org.eclipse.emf.cdo.protocol.model.CDOPackageManager;
import org.eclipse.emf.cdo.util.CDOPackageRegistry;
import org.eclipse.net4j.IChannel;
+import org.eclipse.net4j.signal.IFailOverStrategy;
import org.eclipse.net4j.util.container.IContainer;
import org.eclipse.emf.ecore.resource.ResourceSet;
@@ -25,6 +26,8 @@ public interface CDOSession extends IContainer<CDOView>
{
public int getSessionID();
+ public IFailOverStrategy getFailOverStrategy();
+
public IChannel getChannel();
public boolean isOpen();
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 fba42e6..1c16c9c 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
@@ -519,6 +519,8 @@ public class CDOSessionImpl extends Container<CDOView> implements CDOSession
protected void handleFailOver(IChannel newChannel)
{
+ channel = newChannel;
+ connector = channel.getConnector();
}
@Override