Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2009-05-31 14:26:49 -0400
committerslewis2009-05-31 14:26:49 -0400
commit55c8dcc3e88496f7726caf6858065491650f775d (patch)
tree93425e619f9bfaa42a74732fab1f0dea9ae4e38e /framework/bundles/org.eclipse.ecf.identity/src
parent4525038d18d1e0915d9dff5b229e5b16fe73bc1a (diff)
downloadorg.eclipse.ecf-55c8dcc3e88496f7726caf6858065491650f775d.tar.gz
org.eclipse.ecf-55c8dcc3e88496f7726caf6858065491650f775d.tar.xz
org.eclipse.ecf-55c8dcc3e88496f7726caf6858065491650f775d.zip
Fix for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=278148v20090604-1131
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.java32
1 files changed, 14 insertions, 18 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 570ff5279..401b218b0 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
@@ -259,26 +259,22 @@ public class Activator implements BundleActivator {
IdentityDebugOptions.DEBUG,
"addNamespaceExtensions.createdNamespace(" + ns + ")"); //$NON-NLS-1$ //$NON-NLS-2$
// Check to see if we have a namespace name collision
- if (IDFactory.containsNamespace0(ns))
- throw new CoreException(
- new Status(
+ if (!IDFactory.containsNamespace0(ns)) {
+ // Now add to known namespaces
+ IDFactory.addNamespace0(ns);
+ org.eclipse.ecf.core.util.Trace
+ .trace(
+ Activator.PLUGIN_ID,
+ IdentityDebugOptions.DEBUG,
+ "addNamespaceExtensions.addedNamespaceToFactory(" + ns //$NON-NLS-1$
+ + ")"); //$NON-NLS-1$
+ } else {
+ getDefault().log(
+ new Status(IStatus.WARNING, Activator.PLUGIN_ID,
IStatus.WARNING,
- bundleName,
- FACTORY_NAME_COLLISION_ERRORCODE,
- "Namespace collision=" //$NON-NLS-1$
- + nsName
- + ";contributor=" //$NON-NLS-1$
- + member.getContributor().getName()
- + ";extensionPoint="
- + extension
- .getExtensionPointUniqueIdentifier(),
+ "Namespace collision for name=" + nsName,
null));
- // Now add to known namespaces
- IDFactory.addNamespace0(ns);
- org.eclipse.ecf.core.util.Trace.trace(Activator.PLUGIN_ID,
- IdentityDebugOptions.DEBUG,
- "addNamespaceExtensions.addedNamespaceToFactory(" + ns //$NON-NLS-1$
- + ")"); //$NON-NLS-1$
+ }
} catch (final CoreException e) {
getDefault().log(e.getStatus());
org.eclipse.ecf.core.util.Trace.catching(Activator.PLUGIN_ID,

Back to the top