From 08fd4b326b58efc5769cc5384b380b5d5b78db55 Mon Sep 17 00:00:00 2001
From: slewis
Date: Mon, 31 Jan 2011 13:21:54 -0800
Subject: Fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=335848

---
 .../src/org/eclipse/ecf/server/generic/ServerManager.java               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf')

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 77d629b80..1c3a08fa9 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
@@ -66,7 +66,7 @@ public class ServerManager {
 	public ServerManager() {
 		final IExtensionRegistry reg = Activator.getDefault().getExtensionRegistry();
 		try {
-			if (reg != null) {
+			if (reg != null && reg.getExtensionPoint(EXTENSION_POINT) != null) {
 				createServersFromExtensionRegistry(reg);
 			} else {
 				createServersFromConfigurationFile(Activator.getDefault().getBundle().getEntry("server.xml").openStream()); //$NON-NLS-1$
-- 
cgit v1.2.3