Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2006-12-17 14:50:52 -0500
committerEike Stepper2006-12-17 14:50:52 -0500
commit528b388311b85e941a8aef2809c34f3ab8bc86ae (patch)
tree598f9ceba817fc06099a365858b4552a319ec9b6 /plugins/org.eclipse.emf.cdo.tests/src
parent7f12a7754e50ed8a3c6a1b53321ada8ca0b114b2 (diff)
downloadcdo-528b388311b85e941a8aef2809c34f3ab8bc86ae.tar.gz
cdo-528b388311b85e941a8aef2809c34f3ab8bc86ae.tar.xz
cdo-528b388311b85e941a8aef2809c34f3ab8bc86ae.zip
Fixed manifests
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.tests/src')
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/ClientServerTopology.java25
1 files changed, 20 insertions, 5 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/ClientServerTopology.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/ClientServerTopology.java
index ae81733bf5..c3dd62f572 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/ClientServerTopology.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/topology/ClientServerTopology.java
@@ -169,8 +169,16 @@ public class ClientServerTopology implements ITopology
transactionTemplate.setTransactionManager(transactionManager);
serverRegistry = new HashMapRegistry();
- serverRegistry.register(new ServerCDOResProtocolImpl.Factory(mapper, transactionTemplate));
- serverRegistry.register(new ServerCDOProtocolImpl.Factory(mapper, transactionTemplate));
+ {
+ ServerCDOResProtocolImpl.Factory factory = new ServerCDOResProtocolImpl.Factory(mapper,
+ transactionTemplate);
+ serverRegistry.put(factory.getID(), factory);
+ }
+ {
+ ServerCDOProtocolImpl.Factory factory = new ServerCDOProtocolImpl.Factory(mapper,
+ transactionTemplate);
+ serverRegistry.put(factory.getID(), factory);
+ }
acceptor = Net4jUtil.createTCPAcceptor(bufferPool, selector);
acceptor.setProtocolFactoryRegistry(serverRegistry);
@@ -188,8 +196,15 @@ public class ClientServerTopology implements ITopology
LifecycleUtil.activate(clientPackageManager);
clientRegistry = new HashMapRegistry();
- clientRegistry.register(new ClientCDOProtocolImpl.Factory(clientPackageManager));
- clientRegistry.register(new ClientCDOResProtocolImpl.Factory());
+ {
+ ClientCDOProtocolImpl.Factory factory = new ClientCDOProtocolImpl.Factory(
+ clientPackageManager);
+ clientRegistry.put(factory.getID(), factory);
+ }
+ {
+ ClientCDOResProtocolImpl.Factory factory = new ClientCDOResProtocolImpl.Factory();
+ clientRegistry.put(factory.getID(), factory);
+ }
connector = Net4jUtil.createTCPConnector(bufferPool, selector, "localhost");
connector.setProtocolFactoryRegistry(clientRegistry);
@@ -252,7 +267,7 @@ public class ClientServerTopology implements ITopology
public void waitForSignals()
{
- Collection<Channel> channels = Channel.REGISTRY.getElements();
+ Collection<Channel> channels = Channel.REGISTRY.values();
for (Channel channel : channels)
{
BufferHandler receiveHandler = channel.getReceiveHandler();

Back to the top