diff options
| author | slewis | 2016-01-21 05:36:48 +0000 |
|---|---|---|
| committer | slewis | 2016-01-21 05:36:48 +0000 |
| commit | e6814b8abde0210ad6f235c7d1c703a1e9f340ca (patch) | |
| tree | 84965e2da8a00f77b229e27199968f4335a1437e /framework/bundles | |
| parent | dbf0a52c1c3c3847ef76fb18c8d7dd7625d99baf (diff) | |
| download | org.eclipse.ecf-e6814b8abde0210ad6f235c7d1c703a1e9f340ca.tar.gz org.eclipse.ecf-e6814b8abde0210ad6f235c7d1c703a1e9f340ca.tar.xz org.eclipse.ecf-e6814b8abde0210ad6f235c7d1c703a1e9f340ca.zip | |
Fix for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=486220R-Release_HEAD-sdk_feature-194_194
Change-Id: I6dad75b8006f42574600868e462c9f04ad0212a9
Diffstat (limited to 'framework/bundles')
| -rw-r--r-- | framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF | 2 | ||||
| -rw-r--r-- | framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFPlugin.java | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF index a5b669508..d4b8ac5e6 100644 --- a/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF +++ b/framework/bundles/org.eclipse.ecf/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-Name: %plugin.name Bundle-SymbolicName: org.eclipse.ecf;singleton:=true -Bundle-Version: 3.7.0.qualifier +Bundle-Version: 3.7.100.qualifier Bundle-Activator: org.eclipse.ecf.internal.core.ECFPlugin Bundle-Vendor: %plugin.provider Bundle-Localization: plugin diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFPlugin.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFPlugin.java index 9002f78fc..b74ca9ac1 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFPlugin.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/internal/core/ECFPlugin.java @@ -70,7 +70,7 @@ public class ECFPlugin implements BundleActivator { BundleContext context = null; - private Map disposables = new WeakHashMap(); + private Map disposables = new HashMap(1); // This is Object rather than IExtensionRegistryManager to avoid loading // IRegistryChangeListener class (optional) @@ -387,7 +387,8 @@ public class ECFPlugin implements BundleActivator { // The only required attribute is "factoryName" String factoryName = member.getAttribute(FACTORY_ATTRIBUTE); // Skip over if factory name is invalid - if (factoryName == null || "".equals(factoryName))continue; //$NON-NLS-1$ + if (factoryName == null || "".equals(factoryName)) //$NON-NLS-1$ + continue; IContainerManager manager = (IContainerManager) ContainerFactory.getDefault(); IContainer[] containers = manager.getAllContainers(); if (containers == null) @@ -480,7 +481,8 @@ public class ECFPlugin implements BundleActivator { // The only required attribute is "factoryName" factory = member.getAttribute(FACTORY_ATTRIBUTE); // Skip over if factory name is invalid - if (factory == null || "".equals(factory))continue; //$NON-NLS-1$ + if (factory == null || "".equals(factory)) //$NON-NLS-1$ + continue; // get id attribute id = member.getAttribute(ID_ATTRIBUTE); id = (id == null || "".equals(id)) ? null : id; //$NON-NLS-1$ |