diff options
Diffstat (limited to 'framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/Namespace.java')
| -rw-r--r-- | framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/Namespace.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/Namespace.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/Namespace.java index b413aae9f..3c11115d7 100644 --- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/Namespace.java +++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/Namespace.java @@ -12,7 +12,8 @@ import java.io.Serializable; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.IAdapterManager; +import org.eclipse.ecf.internal.core.identity.Activator; import org.eclipse.ecf.internal.core.identity.Messages; /** @@ -235,7 +236,9 @@ public abstract class Namespace implements Serializable, IAdaptable { if (adapter.isInstance(this)) { return this; } else { - return Platform.getAdapterManager().loadAdapter(this, adapter.getName()); + IAdapterManager manager = Activator.getDefault().getAdapterManager(); + if (manager == null) return null; + else return manager.loadAdapter(this, adapter.getName()); } } |