Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2007-04-20 22:29:48 +0000
committerslewis2007-04-20 22:29:48 +0000
commit7ede54a73e30a6a9b573293885a3b5238a1ae662 (patch)
tree3266e22087514b87d8381a73dfd7597793a8ec18 /server-side/bundles
parent1b21884e8d1101fe0a3e61ea502cea361cc234a9 (diff)
downloadorg.eclipse.ecf-7ede54a73e30a6a9b573293885a3b5238a1ae662.tar.gz
org.eclipse.ecf-7ede54a73e30a6a9b573293885a3b5238a1ae662.tar.xz
org.eclipse.ecf-7ede54a73e30a6a9b573293885a3b5238a1ae662.zip
Changes to have all activator classes return non-null with calls to getDefault(), even in non-OSGi environments
Diffstat (limited to 'server-side/bundles')
-rw-r--r--server-side/bundles/org.eclipse.ecf.server.generic/src/org/eclipse/ecf/internal/server/generic/Activator.java5
1 files changed, 4 insertions, 1 deletions
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 a8a4ddc33..917675b30 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
@@ -116,7 +116,10 @@ public class Activator implements BundleActivator {
*
* @return the shared instance
*/
- public static Activator getDefault() {
+ public synchronized static Activator getDefault() {
+ if (plugin == null) {
+ plugin = new Activator();
+ }
return plugin;
}

Back to the top