Additional fixes for bug
https://bugs.eclipse.org/bugs/show_bug.cgi?id=532205
Change-Id: I0000000000000000000000000000000000000000
diff --git a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jgroups.zeroconf.product b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jgroups.zeroconf.product
index 07ed87b..d741dcb 100644
--- a/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jgroups.zeroconf.product
+++ b/examples/bundles/com.mycorp.examples.timeservice.host/launch/TimeServiceHost.jgroups.zeroconf.product
@@ -69,12 +69,15 @@
<plugin id="org.apache.felix.gogo.command" autoStart="true" startLevel="0" />
<plugin id="org.apache.felix.gogo.runtime" autoStart="true" startLevel="0" />
<plugin id="org.apache.felix.gogo.shell" autoStart="true" startLevel="0" />
+ <plugin id="org.apache.felix.scr" autoStart="true" startLevel="1" />
<plugin id="org.eclipse.core.jobs" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.ecf" autoStart="true" startLevel="0" />
+ <plugin id="org.eclipse.ecf.console" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.ecf.discovery" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.ecf.identity" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.ecf.osgi.services.distribution" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin" autoStart="true" startLevel="0" />
+ <plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.console" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.ecf.osgi.services.remoteserviceadmin.proxy" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.ecf.provider" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.ecf.provider.jgroups" autoStart="true" startLevel="0" />
@@ -86,7 +89,7 @@
<plugin id="org.eclipse.equinox.common" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.concurrent" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.equinox.console" autoStart="true" startLevel="0" />
- <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="0" />
+ <plugin id="org.eclipse.equinox.event" autoStart="true" startLevel="1" />
<plugin id="org.eclipse.osgi" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.osgi.services" autoStart="true" startLevel="0" />
<plugin id="org.eclipse.osgi.services.remoteserviceadmin" autoStart="true" startLevel="0" />
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/EndpointDescriptionPropertiesUtil.java b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/EndpointDescriptionPropertiesUtil.java
index cb941fd..587f812 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/EndpointDescriptionPropertiesUtil.java
+++ b/framework/bundles/org.eclipse.ecf.remoteservice/src/org/eclipse/ecf/remoteservice/util/EndpointDescriptionPropertiesUtil.java
@@ -56,14 +56,16 @@
}
public static List<String> getStringPlusProperty(Map<String, ?> properties, String key) {
- Object value = properties.get(key);
- if (value == null) {
+ if (properties == null)
return Collections.EMPTY_LIST;
- }
- if (value instanceof String) {
+ Object value = properties.get(key);
+
+ if (value == null)
+ return Collections.EMPTY_LIST;
+
+ if (value instanceof String)
return Collections.singletonList((String) value);
- }
if (value instanceof String[]) {
String[] values = (String[]) value;
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/AbstractContainerSelector.java b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/AbstractContainerSelector.java
index e6b5622..d33c3c2 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/AbstractContainerSelector.java
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/AbstractContainerSelector.java
@@ -176,7 +176,7 @@
return containerFactory.createContainer(containerTypeDescription);
} catch (ContainerCreateException e) {
if (e instanceof ContainerIntentException) {
- LogUtility.logWarning("createContainer", DebugOptions.CONTAINER_SELECTOR, this.getClass(), "Container does not satisfy required intent="+((ContainerIntentException) e).getIntentName(),e); //$NON-NLS-1$ //$NON-NLS-2$
+ LogUtility.logError("createContainer", DebugOptions.CONTAINER_SELECTOR, this.getClass(), "Container creation does not satisfy required intent="+((ContainerIntentException) e).getIntentName(), e); //$NON-NLS-1$ //$NON-NLS-2$
return null;
} else
throw new SelectContainerException(
