summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaspar De Groot2010-10-13 22:42:55 (EDT)
committerCaspar De Groot2010-10-13 22:42:55 (EDT)
commitdb01d92da832fa7f5b1cddc6b0e0831fcc466d84 (patch)
tree19fbea0599eb3d41f0b7ad5920d8a7a2f7dffbd1
parent5048ec0ffc5b19002ab771ffd5fbb9b5a7cb5ce9 (diff)
downloadcdo-db01d92da832fa7f5b1cddc6b0e0831fcc466d84.zip
cdo-db01d92da832fa7f5b1cddc6b0e0831fcc466d84.tar.gz
cdo-db01d92da832fa7f5b1cddc6b0e0831fcc466d84.tar.bz2
[327428] Failed-over session broken
https://bugs.eclipse.org/bugs/show_bug.cgi?id=327428
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/FailoverCDOSessionConfigurationImpl.java1
-rw-r--r--plugins/org.eclipse.emf.cdo.net4j/src/org/eclipse/emf/cdo/internal/net4j/FailoverCDOSessionImpl.java10
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 ee92d40..b604cea 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 28d5642..a364980 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();