| commit | 1e2b903082ba4b9cedc9b63604c0010806193fdd | [log] [tgz] |
|---|---|---|
| author | slewis <slewis@composent.com> | Tue Sep 20 16:01:36 2011 -0700 |
| committer | slewis <slewis@composent.com> | Tue Sep 20 16:01:36 2011 -0700 |
| tree | 5fbe050c17b095098708852344b88d6a5953b3ed | |
| parent | 3bfdbc0f7d63cbb1af17c87e503783395c25fcfe [diff] |
Fix for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=358317
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 a078057..bc82614 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 @@ 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 7b3a7c1..adb9d45 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 @@ * @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 @@ gscgFactory = null; } } + plugin = null; this.context = null; } @@ -136,9 +136,8 @@ * @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; }