Merge remote-tracking branch 'origin/master'
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 ccec7c0..ca0c21a 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
@@ -109,7 +109,10 @@
idVal = IDFactory.getDefault().createGUID();
else
newID = getIDFromArg(idVal);
- ka = getIntegerFromArg(map.get(KEEPALIVE_PROP));
+ Object o = map.get(KEEPALIVE_PROP);
+ if (o == null)
+ o = map.get(KEEPALIVE_PROP.toLowerCase());
+ ka = getIntegerFromArg(o);
} else if (args.length > 1) {
if (args[0] instanceof String || args[0] instanceof ID)
newID = getIDFromArg(args[0]);
@@ -144,7 +147,10 @@
if (idVal == null)
throw new IDCreateException("id property must be present for server container creation"); //$NON-NLS-1$
newID = getIDFromArg(idVal);
- ka = getIntegerFromArg(map.get(KEEPALIVE_PROP));
+ Object o = map.get(KEEPALIVE_PROP);
+ if (o == null)
+ o = map.get(KEEPALIVE_PROP.toLowerCase());
+ ka = getIntegerFromArg(o);
} else if (args.length > 1) {
if (args[0] instanceof String || args[0] instanceof ID)
newID = getIDFromArg(args[0]);
@@ -317,4 +323,4 @@
public Dictionary getPropertiesForImportedConfigs(ContainerTypeDescription description, String[] importedConfigs, Dictionary exportedProperties) {
return null;
}
-}
\ No newline at end of file
+}
