Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2016-02-08 02:28:03 +0000
committerslewis2016-02-08 02:28:03 +0000
commite986fb1e5fb685f6a645d2b63d3ce680e432e83b (patch)
tree53fcdb6710e54981194bd9a6bebf98ab2edff3dd /framework
parent33c46507ae1eac907f8b0c3239317d158e3562fe (diff)
downloadorg.eclipse.ecf-e986fb1e5fb685f6a645d2b63d3ce680e432e83b.tar.gz
org.eclipse.ecf-e986fb1e5fb685f6a645d2b63d3ce680e432e83b.tar.xz
org.eclipse.ecf-e986fb1e5fb685f6a645d2b63d3ce680e432e83b.zip
Updated fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=487419
Diffstat (limited to 'framework')
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF2
-rw-r--r--framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/GenericContainerInstantiator.java7
2 files changed, 8 insertions, 1 deletions
diff --git a/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF
index 847483bc2..1fa9519f5 100644
--- a/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf.provider/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Bundle-SymbolicName: org.eclipse.ecf.provider;singleton:=true
-Bundle-Version: 4.7.200.qualifier
+Bundle-Version: 4.7.300.qualifier
Bundle-Name: %plugin.name
Bundle-Vendor: %plugin.provider
Bundle-Activator: org.eclipse.ecf.internal.provider.ProviderPlugin
diff --git a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/GenericContainerInstantiator.java b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/GenericContainerInstantiator.java
index f4dc3dec7..5610c659b 100644
--- a/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/GenericContainerInstantiator.java
+++ b/framework/bundles/org.eclipse.ecf.provider/src/org/eclipse/ecf/provider/generic/GenericContainerInstantiator.java
@@ -296,6 +296,8 @@ public class GenericContainerInstantiator implements IContainerInstantiator, IRe
gcargs = getServerArgs(args);
return createServerContainer(gcargs);
}
+ } catch (IllegalArgumentException e) {
+ throw e;
} catch (Exception e) {
Trace.catching(ProviderPlugin.PLUGIN_ID, ECFProviderDebugOptions.EXCEPTIONS_CATCHING, this.getClass(), "createInstance", e); //$NON-NLS-1$
ProviderPlugin.getDefault().log(new Status(IStatus.ERROR, ProviderPlugin.PLUGIN_ID, CREATE_INSTANCE_ERROR_CODE, "createInstance", e)); //$NON-NLS-1$
@@ -304,6 +306,7 @@ public class GenericContainerInstantiator implements IContainerInstantiator, IRe
}
}
+ @SuppressWarnings("unchecked")
protected Set getAdaptersForClass(Class clazz) {
Set result = new HashSet();
IAdapterManager adapterManager = ProviderPlugin.getDefault().getAdapterManager();
@@ -312,6 +315,7 @@ public class GenericContainerInstantiator implements IContainerInstantiator, IRe
return result;
}
+ @SuppressWarnings("unchecked")
protected Set getInterfacesForClass(Set s, Class clazz) {
if (clazz.equals(Object.class))
return s;
@@ -320,6 +324,7 @@ public class GenericContainerInstantiator implements IContainerInstantiator, IRe
return s;
}
+ @SuppressWarnings("unchecked")
protected Set getInterfacesForClass(Class clazz) {
Set clazzes = getInterfacesForClass(new HashSet(), clazz);
Set result = new HashSet();
@@ -328,6 +333,7 @@ public class GenericContainerInstantiator implements IContainerInstantiator, IRe
return result;
}
+ @SuppressWarnings("unchecked")
protected String[] getInterfacesAndAdaptersForClass(Class clazz) {
Set result = getAdaptersForClass(clazz);
result.addAll(getInterfacesForClass(clazz));
@@ -369,6 +375,7 @@ public class GenericContainerInstantiator implements IContainerInstantiator, IRe
/**
* @since 3.0
*/
+ @SuppressWarnings("unchecked")
public String[] getImportedConfigs(ContainerTypeDescription description, String[] exporterSupportedConfigs) {
if (exporterSupportedConfigs == null)
return null;

Back to the top