Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2009-05-01 15:24:45 -0400
committerslewis2009-05-01 15:24:45 -0400
commitdd5027cbeb78012cb3e5da819710cf48b8ba3706 (patch)
tree05ef9fac83939b75b00e027d7ba9cbf48541c761 /framework/bundles/org.eclipse.ecf.identity/src
parent800b6341ef3e2707b7848b1897bdd47c0cc802f1 (diff)
downloadorg.eclipse.ecf-dd5027cbeb78012cb3e5da819710cf48b8ba3706.tar.gz
org.eclipse.ecf-dd5027cbeb78012cb3e5da819710cf48b8ba3706.tar.xz
org.eclipse.ecf-dd5027cbeb78012cb3e5da819710cf48b8ba3706.zip
Improved fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=254684
Diffstat (limited to 'framework/bundles/org.eclipse.ecf.identity/src')
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IDFactory.java1
-rw-r--r--framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/internal/core/identity/Activator.java8
2 files changed, 6 insertions, 3 deletions
diff --git a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IDFactory.java b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IDFactory.java
index 68e67ec78..02099cca0 100644
--- a/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IDFactory.java
+++ b/framework/bundles/org.eclipse.ecf.identity/src/org/eclipse/ecf/core/identity/IDFactory.java
@@ -59,6 +59,7 @@ public class IDFactory implements IIDFactory {
private static boolean initialized = false;
public synchronized static IIDFactory getDefault() {
+ initialize();
return instance;
}
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 185bbe966..570ff5279 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
@@ -262,12 +262,14 @@ public class Activator implements BundleActivator {
if (IDFactory.containsNamespace0(ns))
throw new CoreException(
new Status(
- IStatus.ERROR,
+ IStatus.WARNING,
bundleName,
FACTORY_NAME_COLLISION_ERRORCODE,
- "name=" //$NON-NLS-1$
+ "Namespace collision=" //$NON-NLS-1$
+ nsName
- + ";extension point id=" //$NON-NLS-1$
+ + ";contributor=" //$NON-NLS-1$
+ + member.getContributor().getName()
+ + ";extensionPoint="
+ extension
.getExtensionPointUniqueIdentifier(),
null));

Back to the top