diff options
Diffstat (limited to 'server-side')
2 files changed, 4 insertions, 5 deletions
diff --git a/server-side/bundles/org.eclipse.ecf.server.generic/META-INF/MANIFEST.MF b/server-side/bundles/org.eclipse.ecf.server.generic/META-INF/MANIFEST.MF index a078057c4..bc826148e 100644 --- a/server-side/bundles/org.eclipse.ecf.server.generic/META-INF/MANIFEST.MF +++ b/server-side/bundles/org.eclipse.ecf.server.generic/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf.server.generic;singleton:=true -Bundle-Version: 5.0.0.qualifier +Bundle-Version: 5.0.100.qualifier Bundle-Activator: org.eclipse.ecf.internal.server.generic.Activator Bundle-Vendor: %plugin.provider Bundle-Localization: plugin diff --git a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/internal/server/generic/Activator.java b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/internal/server/generic/Activator.java index 7b3a7c162..adb9d4596 100644 --- a/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/internal/server/generic/Activator.java +++ b/server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/internal/server/generic/Activator.java @@ -102,7 +102,6 @@ public class Activator implements BundleActivator { * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext) */ public void stop(BundleContext ctxt) throws Exception { - plugin = null; if (serverManager != null) { serverManager.closeServers(); serverManager = null; @@ -127,6 +126,7 @@ public class Activator implements BundleActivator { gscgFactory = null; } } + plugin = null; this.context = null; } @@ -136,9 +136,8 @@ public class Activator implements BundleActivator { * @return the shared instance */ public synchronized static Activator getDefault() { - if (plugin == null) { - plugin = new Activator(); - } + if (plugin == null) + throw new NullPointerException("Default Activator is null"); //$NON-NLS-1$ return plugin; } |