diff options
| author | slewis | 2010-02-09 01:25:39 +0000 |
|---|---|---|
| committer | slewis | 2010-02-09 01:25:39 +0000 |
| commit | bbfc4457c5e5007ee85d235f6f3076901106b02f (patch) | |
| tree | bf1e2e8332a4d8e2116578847512f6ed3aa4149c /framework/bundles/org.eclipse.ecf.sharedobject | |
| parent | 32c94f74a1e2301f015879ad3d7532c9bfc31100 (diff) | |
| download | org.eclipse.ecf-bbfc4457c5e5007ee85d235f6f3076901106b02f.tar.gz org.eclipse.ecf-bbfc4457c5e5007ee85d235f6f3076901106b02f.tar.xz org.eclipse.ecf-bbfc4457c5e5007ee85d235f6f3076901106b02f.zip | |
Adjusted getAdapter implementations so that they can be called outside OSGi without throwing NPE
Diffstat (limited to 'framework/bundles/org.eclipse.ecf.sharedobject')
| -rw-r--r-- | framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/BaseSharedObject.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/BaseSharedObject.java b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/BaseSharedObject.java index e9a3e9e06..e22243e6f 100644 --- a/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/BaseSharedObject.java +++ b/framework/bundles/org.eclipse.ecf.sharedobject/src/org/eclipse/ecf/core/sharedobject/BaseSharedObject.java @@ -109,7 +109,10 @@ public class BaseSharedObject implements ISharedObject, IIdentifiable { if (adapter.isInstance(this)) { return this; } - final IAdapterManager adapterManager = Activator.getDefault().getAdapterManager(); + Activator activator = Activator.getDefault(); + if (activator == null) + return null; + final IAdapterManager adapterManager = activator.getAdapterManager(); if (adapterManager == null) return null; return adapterManager.loadAdapter(this, adapter.getName()); |