[327428] Failed-over session broken

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

2 files changed, 8 insertions, 3 deletions

diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/FailoverCDOSessionConfigurationImpl.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/FailoverCDOSessionConfigurationImpl.java
index ee92d40d4c..b604ceaeb9 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/FailoverCDOSessionConfigurationImpl.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/FailoverCDOSessionConfigurationImpl.java
@@ -82,6 +82,5 @@ public class FailoverCDOSessionConfigurationImpl extends CDONet4jSessionConfigur
     sessionImpl.setMonitorConnectionDescription(monitorConnectorDescription);
     sessionImpl.setRepositoryGroup(repositoryGroup);
     sessionImpl.setContainer(container);
-    sessionImpl.updateConnectorAndRepositoryName(); // TODO (CD) Can't we leave it to the session to call this?
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/FailoverCDOSessionImpl.java b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/FailoverCDOSessionImpl.java
index 28d56429d1..a364980590 100644
--- a/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/FailoverCDOSessionImpl.java
+++ b/plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/FailoverCDOSessionImpl.java
@@ -145,8 +145,14 @@ public class FailoverCDOSessionImpl extends CDONet4jSessionImpl
     }
   }
 
-  // TODO (CD) Default access allows config object to call this once. Does this make sense?
-  void updateConnectorAndRepositoryName()
+  @Override
+  protected void activateSession() throws Exception
+  {
+    updateConnectorAndRepositoryName();
+    super.activateSession();
+  }
+
+  private void updateConnectorAndRepositoryName()
   {
     // System.out.println("Querying fail-over monitor...");
     queryRepositoryInfoFromMonitor();