Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2007-04-20 18:01:42 -0400
committerslewis2007-04-20 18:01:42 -0400
commitb341d53c44cc05627a9d08374da899e196359dd8 (patch)
treecebf59edb914565c7551907d7c815c652188d148 /framework/bundles/org.eclipse.ecf.identity/src
parent0cf391f96a3b82722f7e0c6f95ef354617c8184f (diff)
downloadorg.eclipse.ecf-b341d53c44cc05627a9d08374da899e196359dd8.tar.gz
org.eclipse.ecf-b341d53c44cc05627a9d08374da899e196359dd8.tar.xz
org.eclipse.ecf-b341d53c44cc05627a9d08374da899e196359dd8.zip
Fixes for NPE running in non OSGi environment
Diffstat (limited to 'framework/bundles/org.eclipse.ecf.identity/src')
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Activator.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Activator.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Activator.java
index 511e6d925..a0dfb5be8 100644
--- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Activator.java
+++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Activator.java
@@ -370,7 +370,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