diff options
| author | slewis | 2009-10-23 17:49:05 +0000 |
|---|---|---|
| committer | slewis | 2009-10-23 17:49:05 +0000 |
| commit | 153127924b37a4216735662d4a3156e215143889 (patch) | |
| tree | 8e7a1cd39bcb66f1f042fe51de1f77291907fafc /server-side | |
| parent | 94c2515b6704548345d4f0dfd0929af87ab85952 (diff) | |
| download | org.eclipse.ecf-153127924b37a4216735662d4a3156e215143889.tar.gz org.eclipse.ecf-153127924b37a4216735662d4a3156e215143889.tar.xz org.eclipse.ecf-153127924b37a4216735662d4a3156e215143889.zip | |
Fix for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=293191
Diffstat (limited to 'server-side')
2 files changed, 8 insertions, 4 deletions
diff --git a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/AbstractGenericServer.java b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/AbstractGenericServer.java index 9ac0bc14f..1b28dba98 100644 --- a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/AbstractGenericServer.java +++ b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/AbstractGenericServer.java @@ -76,8 +76,10 @@ public abstract class AbstractGenericServer { throw new NullPointerException("Cannot create ID with null or empty path"); //$NON-NLS-1$ GenericServerContainer s = new GenericServerContainer(this, createServerConfig(path), serverGroup, path, keepAlive); IContainerManager containerManager = Activator.getDefault().getContainerManager(); - ContainerTypeDescription ctd = containerManager.getContainerFactory().getDescriptionByName("ecf.generic.server"); //$NON-NLS-1$ - containerManager.addContainer(s, ctd); + if (containerManager != null) { + ContainerTypeDescription ctd = containerManager.getContainerFactory().getDescriptionByName("ecf.generic.server"); //$NON-NLS-1$ + containerManager.addContainer(s, ctd); + } IConnectHandlerPolicy policy = createConnectHandlerPolicy(s, path); if (policy != null) s.setConnectPolicy(policy); diff --git a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/ServerManager.java b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/ServerManager.java index ab2d59b02..0f8ffd5d2 100644 --- a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/ServerManager.java +++ b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/server/generic/ServerManager.java @@ -179,8 +179,10 @@ public class ServerManager { final ID newServerID = IDFactory.getDefault().createStringID(id); TCPServerSOContainer container = new TCPServerSOContainer(new SOContainerConfig(newServerID), group, path, keepAlive); IContainerManager containerManager = Activator.getDefault().getContainerManager(); - ContainerTypeDescription ctd = containerManager.getContainerFactory().getDescriptionByName("ecf.generic.server"); //$NON-NLS-1$ - containerManager.addContainer(container, ctd); + if (containerManager != null) { + ContainerTypeDescription ctd = containerManager.getContainerFactory().getDescriptionByName("ecf.generic.server"); //$NON-NLS-1$ + containerManager.addContainer(container, ctd); + } return container; } |