Fixes and additions to address bug

https://bugs.eclipse.org/bugs/show_bug.cgi?id=472756

Change-Id: I87840774df2b604fd9bffdbda9d3c1ba410a1493

6 files changed, 72 insertions, 492 deletions

diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/.settings/.api_filters b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/.settings/.api_filters
index 7f563fe40..12e73c0e3 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/.settings/.api_filters
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/.settings/.api_filters
@@ -1,227 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <component id="org.eclipse.ecf.osgi.services.remoteserviceadmin" version="2">
-    <resource path="src/org/eclipse/ecf/osgi/services/remoteserviceadmin/AbstractMetadataFactory.java" type="org.eclipse.ecf.osgi.services.remoteserviceadmin.AbstractMetadataFactory">
-        <filter id="643842064">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="AbstractMetadataFactory"/>
-                <message_argument value="decodeEndpointDescription(IServiceProperties)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="AbstractMetadataFactory"/>
-                <message_argument value="encodeOSGiServiceProperties(EndpointDescription, IServiceProperties)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="AbstractMetadataFactory"/>
-                <message_argument value="encodeServiceProperties(EndpointDescription, IServiceProperties)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/ecf/osgi/services/remoteserviceadmin/AbstractTopologyManager.java" type="org.eclipse.ecf.osgi.services.remoteserviceadmin.AbstractTopologyManager">
-        <filter id="643842064">
-            <message_arguments>
-                <message_argument value="RemoteServiceAdmin"/>
-                <message_argument value="AbstractTopologyManager"/>
-                <message_argument value="getRemoteServiceAdmin()"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="AbstractTopologyManager"/>
-                <message_argument value="advertiseEndpointDescription(EndpointDescription)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="AbstractTopologyManager"/>
-                <message_argument value="advertiseModifyEndpointDescription(EndpointDescription)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="AbstractTopologyManager"/>
-                <message_argument value="handleAdvertisingResult(IStatus, EndpointDescription, boolean)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="AbstractTopologyManager"/>
-                <message_argument value="handleECFEndpointRemoved(EndpointDescription)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="AbstractTopologyManager"/>
-                <message_argument value="handleNonECFEndpointAdded(EndpointListener, EndpointDescription)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="AbstractTopologyManager"/>
-                <message_argument value="handleNonECFEndpointModified(EndpointEventListener, EndpointDescription)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="AbstractTopologyManager"/>
-                <message_argument value="handleNonECFEndpointRemoved(EndpointDescription, String)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="AbstractTopologyManager"/>
-                <message_argument value="handleNonECFEndpointRemoved(EndpointListener, EndpointDescription)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="AbstractTopologyManager"/>
-                <message_argument value="unadvertiseEndpointDescription(EndpointDescription)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointEventListener"/>
-                <message_argument value="AbstractTopologyManager"/>
-                <message_argument value="handleNonECFEndpointModified(EndpointEventListener, EndpointDescription)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointListener"/>
-                <message_argument value="AbstractTopologyManager"/>
-                <message_argument value="handleNonECFEndpointAdded(EndpointListener, EndpointDescription)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointListener"/>
-                <message_argument value="AbstractTopologyManager"/>
-                <message_argument value="handleNonECFEndpointRemoved(EndpointListener, EndpointDescription)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="ImportRegistration"/>
-                <message_argument value="AbstractTopologyManager"/>
-                <message_argument value="handleInvalidImportRegistration(ImportRegistration, Throwable)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/ecf/osgi/services/remoteserviceadmin/DebugRemoteServiceAdminListener.java" type="org.eclipse.ecf.osgi.services.remoteserviceadmin.DebugRemoteServiceAdminListener">
-        <filter id="576725006">
-            <message_arguments>
-                <message_argument value="RemoteServiceAdminListener"/>
-                <message_argument value="DebugRemoteServiceAdminListener"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="RemoteServiceAdminEvent"/>
-                <message_argument value="DebugRemoteServiceAdminListener"/>
-                <message_argument value="remoteAdminEvent(RemoteServiceAdminEvent)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/ecf/osgi/services/remoteserviceadmin/DiscoveredEndpointDescription.java" type="org.eclipse.ecf.osgi.services.remoteserviceadmin.DiscoveredEndpointDescription">
-        <filter id="643842064">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="DiscoveredEndpointDescription"/>
-                <message_argument value="getEndpointDescription()"/>
-            </message_arguments>
-        </filter>
-        <filter id="643850349">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="DiscoveredEndpointDescription"/>
-                <message_argument value="DiscoveredEndpointDescription(Namespace, IServiceID, EndpointDescription)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/ecf/osgi/services/remoteserviceadmin/DiscoveredEndpointDescriptionFactory.java" type="org.eclipse.ecf.osgi.services.remoteserviceadmin.DiscoveredEndpointDescriptionFactory">
-        <filter id="643842064">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="DiscoveredEndpointDescriptionFactory"/>
-                <message_argument value="createEndpointDescription(IDiscoveryLocator, IServiceInfo)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="DiscoveredEndpointDescriptionFactory"/>
-                <message_argument value="createDiscoveredEndpointDescription(IDiscoveryLocator, IServiceInfo, EndpointDescription)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="DiscoveredEndpointDescriptionFactory"/>
-                <message_argument value="removeDiscoveredEndpointDescription(EndpointDescription)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/ecf/osgi/services/remoteserviceadmin/EndpointDescription.java" type="org.eclipse.ecf.osgi.services.remoteserviceadmin.EndpointDescription">
-        <filter id="576720909">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="EndpointDescription"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="isSameService(EndpointDescription)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/ecf/osgi/services/remoteserviceadmin/EndpointDescriptionLocator.java" type="org.eclipse.ecf.osgi.services.remoteserviceadmin.EndpointDescriptionLocator">
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="EndpointDescriptionLocator"/>
-                <message_argument value="getMatchingEndpointEventListenerHolders(EndpointDescription, int)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="EndpointDescriptionLocator"/>
-                <message_argument value="getMatchingEndpointEventListenerHolders(ServiceReference[], EndpointDescription, int)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="EndpointDescriptionLocator"/>
-                <message_argument value="getMatchingEndpointListenerHolders(EndpointDescription)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="EndpointDescriptionLocator"/>
-                <message_argument value="getMatchingEndpointListenerHolders(ServiceReference[], EndpointDescription)"/>
-            </message_arguments>
-        </filter>
-    </resource>
     <resource path="src/org/eclipse/ecf/osgi/services/remoteserviceadmin/EndpointDescriptionLocator.java" type="org.eclipse.ecf.osgi.services.remoteserviceadmin.EndpointDescriptionLocator$EndpointEventListenerHolder">
         <filter id="643842064">
             <message_arguments>
@@ -282,246 +60,4 @@
             </message_arguments>
         </filter>
     </resource>
-    <resource path="src/org/eclipse/ecf/osgi/services/remoteserviceadmin/EndpointDescriptionReader.java" type="org.eclipse.ecf.osgi.services.remoteserviceadmin.EndpointDescriptionReader">
-        <filter id="643842064">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="EndpointDescriptionReader"/>
-                <message_argument value="readEndpointDescriptions(InputStream)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/ecf/osgi/services/remoteserviceadmin/EndpointDescriptionWriter.java" type="org.eclipse.ecf.osgi.services.remoteserviceadmin.EndpointDescriptionWriter">
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="EndpointDescriptionWriter"/>
-                <message_argument value="writeEndpointDescription(EndpointDescription)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="EndpointDescriptionWriter"/>
-                <message_argument value="writeEndpointDescription(Writer, EndpointDescription)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="EndpointDescriptionWriter"/>
-                <message_argument value="writeEndpointDescription(int, Writer, EndpointDescription)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="EndpointDescriptionWriter"/>
-                <message_argument value="writeEndpointDescriptions(EndpointDescription[])"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="EndpointDescriptionWriter"/>
-                <message_argument value="writeEndpointDescriptions(Writer, EndpointDescription[])"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="EndpointDescriptionWriter"/>
-                <message_argument value="writeProperties(int, Writer, EndpointDescription)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/ecf/osgi/services/remoteserviceadmin/IDiscoveredEndpointDescriptionFactory.java" type="org.eclipse.ecf.osgi.services.remoteserviceadmin.IDiscoveredEndpointDescriptionFactory">
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="IDiscoveredEndpointDescriptionFactory"/>
-                <message_argument value="removeDiscoveredEndpointDescription(EndpointDescription)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/ecf/osgi/services/remoteserviceadmin/IEndpointDescriptionReader.java" type="org.eclipse.ecf.osgi.services.remoteserviceadmin.IEndpointDescriptionReader">
-        <filter id="643842064">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="IEndpointDescriptionReader"/>
-                <message_argument value="readEndpointDescriptions(InputStream)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/ecf/osgi/services/remoteserviceadmin/IServiceInfoFactory.java" type="org.eclipse.ecf.osgi.services.remoteserviceadmin.IServiceInfoFactory">
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="IServiceInfoFactory"/>
-                <message_argument value="createServiceInfo(IDiscoveryAdvertiser, EndpointDescription)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteServiceAdmin.java" type="org.eclipse.ecf.osgi.services.remoteserviceadmin.RemoteServiceAdmin">
-        <filter id="576725006">
-            <message_arguments>
-                <message_argument value="RemoteServiceAdmin"/>
-                <message_argument value="RemoteServiceAdmin"/>
-            </message_arguments>
-        </filter>
-        <filter id="643842064">
-            <message_arguments>
-                <message_argument value="ImportRegistration"/>
-                <message_argument value="RemoteServiceAdmin"/>
-                <message_argument value="importService(EndpointDescription)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="RemoteServiceAdmin"/>
-                <message_argument value="importService(EndpointDescription)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteServiceAdmin.java" type="org.eclipse.ecf.osgi.services.remoteserviceadmin.RemoteServiceAdmin$ExportReference">
-        <filter id="576725006">
-            <message_arguments>
-                <message_argument value="ExportReference"/>
-                <message_argument value="ExportReference"/>
-            </message_arguments>
-        </filter>
-        <filter id="643842064">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="ExportReference"/>
-                <message_argument value="getExportedEndpoint()"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteServiceAdmin.java" type="org.eclipse.ecf.osgi.services.remoteserviceadmin.RemoteServiceAdmin$ExportRegistration">
-        <filter id="576725006">
-            <message_arguments>
-                <message_argument value="ExportRegistration"/>
-                <message_argument value="ExportRegistration"/>
-            </message_arguments>
-        </filter>
-        <filter id="643842064">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="ExportRegistration"/>
-                <message_argument value="update(Map&lt;String,?&gt;)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643842064">
-            <message_arguments>
-                <message_argument value="ExportReference"/>
-                <message_argument value="ExportRegistration"/>
-                <message_argument value="getExportReference()"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteServiceAdmin.java" type="org.eclipse.ecf.osgi.services.remoteserviceadmin.RemoteServiceAdmin$ImportReference">
-        <filter id="576725006">
-            <message_arguments>
-                <message_argument value="ImportReference"/>
-                <message_argument value="ImportReference"/>
-            </message_arguments>
-        </filter>
-        <filter id="643842064">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="ImportReference"/>
-                <message_argument value="getImportedEndpoint()"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteServiceAdmin.java" type="org.eclipse.ecf.osgi.services.remoteserviceadmin.RemoteServiceAdmin$ImportRegistration">
-        <filter id="576725006">
-            <message_arguments>
-                <message_argument value="ImportRegistration"/>
-                <message_argument value="ImportRegistration"/>
-            </message_arguments>
-        </filter>
-        <filter id="643842064">
-            <message_arguments>
-                <message_argument value="ImportReference"/>
-                <message_argument value="ImportRegistration"/>
-                <message_argument value="getImportReference()"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="ImportRegistration"/>
-                <message_argument value="update(EndpointDescription)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteServiceAdmin.java" type="org.eclipse.ecf.osgi.services.remoteserviceadmin.RemoteServiceAdmin$RemoteServiceAdminEvent">
-        <filter id="576720909">
-            <message_arguments>
-                <message_argument value="RemoteServiceAdminEvent"/>
-                <message_argument value="RemoteServiceAdminEvent"/>
-            </message_arguments>
-        </filter>
-        <filter id="643850349">
-            <message_arguments>
-                <message_argument value="ExportReference"/>
-                <message_argument value="RemoteServiceAdminEvent"/>
-                <message_argument value="RemoteServiceAdminEvent(RemoteServiceAdmin, ID, int, Bundle, ExportReference, Throwable, EndpointDescription)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643850349">
-            <message_arguments>
-                <message_argument value="ImportReference"/>
-                <message_argument value="RemoteServiceAdminEvent"/>
-                <message_argument value="RemoteServiceAdminEvent(RemoteServiceAdmin, ID, int, Bundle, ImportReference, Throwable, EndpointDescription)"/>
-            </message_arguments>
-        </filter>
-    </resource>
-    <resource path="src/org/eclipse/ecf/osgi/services/remoteserviceadmin/ServiceInfoFactory.java" type="org.eclipse.ecf.osgi.services.remoteserviceadmin.ServiceInfoFactory">
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="ServiceInfoFactory"/>
-                <message_argument value="createDefaultServiceName(EndpointDescription, IDiscoveryAdvertiser, IServiceTypeID)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="ServiceInfoFactory"/>
-                <message_argument value="createServiceInfo(IDiscoveryAdvertiser, EndpointDescription)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="ServiceInfoFactory"/>
-                <message_argument value="createServiceName(EndpointDescription, IDiscoveryAdvertiser, IServiceTypeID)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="ServiceInfoFactory"/>
-                <message_argument value="createServiceProperties(EndpointDescription, IDiscoveryAdvertiser, IServiceTypeID, String, URI)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="ServiceInfoFactory"/>
-                <message_argument value="createServiceTypeID(EndpointDescription, IDiscoveryAdvertiser)"/>
-            </message_arguments>
-        </filter>
-        <filter id="643846161">
-            <message_arguments>
-                <message_argument value="EndpointDescription"/>
-                <message_argument value="ServiceInfoFactory"/>
-                <message_argument value="createURI(EndpointDescription, IDiscoveryAdvertiser, IServiceTypeID, String)"/>
-            </message_arguments>
-        </filter>
-    </resource>
 </component>
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/AbstractConsumerContainerSelector.java b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/AbstractConsumerContainerSelector.java
index ae0b7f29a..1fdd2b56d 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/AbstractConsumerContainerSelector.java
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/AbstractConsumerContainerSelector.java
@@ -175,13 +175,8 @@ public class AbstractConsumerContainerSelector extends
 							selectedConfig,
 							PropertiesUtil
 									.createMapFromDictionary(importedConfigProperties));
-					if (rsContainer != null) {
-						trace("createAndConfigureProxyContainers", //$NON-NLS-1$
-								"created new proxy container with config type=" //$NON-NLS-1$
-										+ selectedConfig + " and id=" //$NON-NLS-1$
-										+ rsContainer.getContainer().getID());
+					if (rsContainer != null) 
 						return rsContainer;
-					}
 				}
 			}
 		}
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/ConsumerContainerSelector.java b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/ConsumerContainerSelector.java
index f08a14866..1714bc061 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/ConsumerContainerSelector.java
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/ConsumerContainerSelector.java
@@ -36,7 +36,7 @@ public class ConsumerContainerSelector extends
 	public IRemoteServiceContainer selectConsumerContainer(
 			EndpointDescription endpointDescription)
 			throws SelectContainerException {
-		trace("selectConsumerContainers", "endpointDescription=" + endpointDescription); //$NON-NLS-1$ //$NON-NLS-2$
+		trace("selectConsumerContainer", "endpointDescription=" + endpointDescription); //$NON-NLS-1$ //$NON-NLS-2$
 
 		// Get service.imported.configs
 		List<String> sic = PropertiesUtil
@@ -68,6 +68,8 @@ public class ConsumerContainerSelector extends
 		// connected
 		connectContainerToTarget(rsContainer, connectTargetID);
 
+		trace("selectConsumerContainer", "rsContainer selected=" + rsContainer); //$NON-NLS-1$ //$NON-NLS-2$
+
 		return rsContainer;
 	}
 
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/EndpointDescriptionLocator.java b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/EndpointDescriptionLocator.java
index 4e10a2bee..8639c7b0d 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/EndpointDescriptionLocator.java
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/EndpointDescriptionLocator.java
@@ -589,12 +589,7 @@ public class EndpointDescriptionLocator implements IEndpointDescriptionLocator {
 
 			}
 		} else {
-			LogUtility.logWarning(
-					"queueEndpointDescription", //$NON-NLS-1$
-					DebugOptions.ENDPOINT_DESCRIPTION_LOCATOR, this.getClass(),
-					"No matching EndpointListeners found for " //$NON-NLS-1$
-							+ (discovered ? "discovered" : "undiscovered") //$NON-NLS-1$ //$NON-NLS-2$
-							+ " endpointDescription=" + endpointDescription); //$NON-NLS-1$
+			// For old-style notification, we ignore this since it's probably using EndpointEvents
 		}
 
 	}
@@ -1198,12 +1193,12 @@ public class EndpointDescriptionLocator implements IEndpointDescriptionLocator {
 		void handleService(IServiceInfo serviceInfo, boolean discovered) {
 			if (locator == null)
 				return;
-			trace("handleService", "fwk=" + getFrameworkUUID() + " serviceInfo=" + serviceInfo //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
-							+ ", discovered=" + discovered + ", locator=" + locator); //$NON-NLS-1$ //$NON-NLS-2$
 			IServiceID serviceID = serviceInfo.getServiceID();
 			// Make sure this is an OSGi Remote Service
 			if (Arrays.asList(serviceID.getServiceTypeID().getServices())
 					.contains(RemoteConstants.DISCOVERY_SERVICE_TYPE)) {
+				trace("handleService", "fwk=" + getFrameworkUUID() + " serviceInfo=" + serviceInfo //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+						+ ", discovered=" + discovered + ", locator=" + locator); //$NON-NLS-1$ //$NON-NLS-2$
 				synchronized (edToServiceIDMap) {
 					// Try to find ED from ServiceID, whether discovered or
 					// undiscovered
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/HostContainerSelector.java b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/HostContainerSelector.java
index 0221ad713..a583b96b3 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/HostContainerSelector.java
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/HostContainerSelector.java
@@ -9,6 +9,7 @@
  ******************************************************************************/
 package org.eclipse.ecf.osgi.services.remoteserviceadmin;
 
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
@@ -53,6 +54,16 @@ public class HostContainerSelector extends AbstractHostContainerSelector
 			String[] serviceExportedInterfaces,
 			String[] serviceExportedConfigs, String[] serviceIntents)
 			throws SelectContainerException {
+		trace("selectHostContainers", //$NON-NLS-1$
+				"serviceReference=" + serviceReference + ",overridingProperties=" + overridingProperties //$NON-NLS-1$ //$NON-NLS-2$
+						+ ",exportedInterfaces=" //$NON-NLS-1$
+						+ ((serviceExportedInterfaces == null) ? Collections.EMPTY_LIST
+								: Arrays.asList(serviceExportedInterfaces))
+						+ ",serviceExportedConfigs=" //$NON-NLS-1$
+						+ ((serviceExportedConfigs == null) ? Collections.EMPTY_LIST
+								: Arrays.asList(serviceExportedConfigs))
+						+ ",serviceIntents=" //$NON-NLS-1$
+						+ ((serviceIntents == null) ? Collections.EMPTY_LIST : Arrays.asList(serviceIntents)));
 		// Find previously created containers that match the given
 		// serviceExportedConfigs and serviceIntents
 		Collection rsContainers = (reuseExistingContainers) ? selectExistingHostContainers(
@@ -88,9 +99,10 @@ public class HostContainerSelector extends AbstractHostContainerSelector
 			}
 		}
 
+		trace("selectHostContainers","rsContainers selected="+rsContainers); //$NON-NLS-1$ //$NON-NLS-2$
 		// return result
 		return (IRemoteServiceContainer[]) rsContainers
-				.toArray(new IRemoteServiceContainer[] {});
+				.toArray(new IRemoteServiceContainer[rsContainers.size()]);
 	}
 
 	public void close() {
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteServiceAdmin.java b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteServiceAdmin.java
index 0e0fd15a8..fd59711d2 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteServiceAdmin.java
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteServiceAdmin.java
@@ -374,6 +374,9 @@ public class RemoteServiceAdmin implements
 		// publish all activeExportRegistrations
 		for (ExportRegistration exportReg : resultRegistrations)
 			publishExportEvent(exportReg);
+
+		trace("exportService","exported registrations="+resultRegistrations); //$NON-NLS-1$ //$NON-NLS-2$
+
 		// and return
 		return new ArrayList<org.osgi.service.remoteserviceadmin.ExportRegistration>(
 				resultRegistrations);
@@ -435,6 +438,7 @@ public class RemoteServiceAdmin implements
 		}
 		// publish import event
 		publishImportEvent(importRegistration);
+		trace("importService","importRegistration="+importRegistration); //$NON-NLS-1$ //$NON-NLS-2$
 		// Finally, return the importRegistration. It may be null or not.
 		return importRegistration;
 	}
@@ -571,6 +575,13 @@ public class RemoteServiceAdmin implements
 
 		private Map<String,Object> originalProperties;
 		
+		public String toString() {
+			StringBuffer buf = new StringBuffer("ExportEndpoint["); //$NON-NLS-1$
+			buf.append("serviceReference=").append(serviceReference).append(";"); //$NON-NLS-1$ //$NON-NLS-2$
+			buf.append("rsRegistration=").append(rsRegistration).append("]"); //$NON-NLS-1$ //$NON-NLS-2$
+			return buf.toString();
+		}
+		
 		ExportEndpoint(ServiceReference serviceReference,
 				EndpointDescription endpointDescription,
 				IRemoteServiceRegistration reg, Map<String,Object> originalProperties) {
@@ -657,6 +668,13 @@ public class RemoteServiceAdmin implements
 
 		private boolean closed = false;
 
+		public String toString() {
+			StringBuffer buf = new StringBuffer("ExportRegistration["); //$NON-NLS-1$
+			buf.append("exportReference=").append(exportReference).append(";"); //$NON-NLS-1$ //$NON-NLS-2$
+			buf.append("closed=").append(closed).append("]"); //$NON-NLS-1$ //$NON-NLS-2$
+			return buf.toString();
+		}
+		
 		ExportRegistration(ExportEndpoint exportEndpoint) {
 			Assert.isNotNull(exportEndpoint);
 			exportEndpoint.addExportRegistration(this);
@@ -805,6 +823,13 @@ public class RemoteServiceAdmin implements
 		private Throwable exception;
 		private EndpointDescription errorEndpointDescription;
 
+		public String toString() {
+			StringBuffer buf = new StringBuffer("ExportReference["); //$NON-NLS-1$
+			buf.append("exportEndpoint="+exportEndpoint).append(";"); //$NON-NLS-1$ //$NON-NLS-2$
+			buf.append("exception=").append(exception).append(";").append("]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			return buf.toString();
+		}
+		
 		ExportReference(ExportEndpoint exportEndpoint) {
 			Assert.isNotNull(exportEndpoint);
 			this.exportEndpoint = exportEndpoint;
@@ -882,6 +907,13 @@ public class RemoteServiceAdmin implements
 		private ServiceRegistration proxyRegistration;
 		private Set<ImportRegistration> activeImportRegistrations = new HashSet<ImportRegistration>();
 
+		public String toString() {
+			StringBuffer buf = new StringBuffer("ImportEndpoint["); //$NON-NLS-1$
+			buf.append("proxyRegistration=").append(proxyRegistration);  //$NON-NLS-1$
+			buf.append("rsReference=").append(rsReference).append(";").append("]"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+			return buf.toString();
+		}
+		
 		ImportEndpoint(ID importContainerID, IRemoteServiceContainerAdapter rsContainerAdapter,
 				IRemoteServiceReference rsReference,
 				IRemoteService rs,
@@ -989,6 +1021,13 @@ public class RemoteServiceAdmin implements
 
 		private boolean closed = false;
 
+		public String toString() {
+			StringBuffer buf = new StringBuffer("ImportRegistration["); //$NON-NLS-1$
+			buf.append("importReference=").append(importReference).append(";"); //$NON-NLS-1$ //$NON-NLS-2$
+			buf.append("closed=").append(closed).append("]"); //$NON-NLS-1$ //$NON-NLS-2$
+			return buf.toString();
+		}
+		
 		ImportRegistration(ImportEndpoint importEndpoint) {
 			Assert.isNotNull(importEndpoint);
 			importEndpoint.addImportRegistration(this);
@@ -1103,6 +1142,13 @@ public class RemoteServiceAdmin implements
 		private Throwable exception;
 		private EndpointDescription errorEndpointDescription;
 
+		public String toString() {
+			StringBuffer buf = new StringBuffer("ImportReference["); //$NON-NLS-1$
+			buf.append("importEndpoint=").append(importEndpoint).append(";"); //$NON-NLS-1$ //$NON-NLS-2$
+			buf.append("exception=").append(exception).append("]"); //$NON-NLS-1$ //$NON-NLS-2$
+			return buf.toString();
+		}
+		
 		ImportReference(ImportEndpoint importEndpoint) {
 			Assert.isNotNull(importEndpoint);
 			this.importEndpoint = importEndpoint;
@@ -1973,21 +2019,12 @@ public class RemoteServiceAdmin implements
 	private boolean comparePackageVersions(String packageName,
 			Version remoteVersion, Version localVersion)
 			throws RuntimeException {
-
-		LogUtility.trace(
-				"comparePackageVersions", //$NON-NLS-1$
-				DebugOptions.PACKAGE_VERSION_COMPARATOR, this.getClass(),
-				"packageName=" + packageName + ",remoteVersion=" //$NON-NLS-1$ //$NON-NLS-2$
-						+ remoteVersion + ",localVersion=" + localVersion); //$NON-NLS-1$
-
 		// If no remote version info, then set it to empty
 		if (remoteVersion == null)
 			remoteVersion = Version.emptyVersion;
 		if (localVersion == null)
 			localVersion = Version.emptyVersion;
-
-		// By default we do strict comparison of remote with local...they must
-		// be exactly the same, or we thrown a runtime exception
+		// We do strict comparison of remote with local
 		int compareResult = localVersion.compareTo(remoteVersion);
 		// Now check compare result, and throw exception to fail compare
 		return (compareResult != 0);
@@ -2011,6 +2048,11 @@ public class RemoteServiceAdmin implements
 			Version remoteVersion = interfaceVersions.get(className);
 			Version localVersion = getPackageVersionViaRequestingBundle(
 					packageName, bundle, remoteVersion);
+			LogUtility.trace("comparePackageVersions", //$NON-NLS-1$
+					DebugOptions.PACKAGE_VERSION_COMPARATOR, this.getClass(),
+					"bundle=" + bundle.getSymbolicName() + ",class=" + clazz + ",packageName=" + packageName  //$NON-NLS-1$ //$NON-NLS-2$//$NON-NLS-3$
+							+ ",remoteVersion=" //$NON-NLS-1$
+							+ remoteVersion + ",localVersion=" + localVersion); //$NON-NLS-1$
 			if (comparePackageVersions(packageName, remoteVersion, localVersion)) {
 				logError("verifyServiceInterfaceVersionsForProxy", //$NON-NLS-1$
 						"Failed version check for proxy creation.  clientBundle=" //$NON-NLS-1$
@@ -2256,8 +2298,6 @@ public class RemoteServiceAdmin implements
 	private ImportRegistration importService(
 			EndpointDescription endpointDescription,
 			IRemoteServiceContainer rsContainer) {
-		trace("doImportService", "endpointDescription=" + endpointDescription //$NON-NLS-1$ //$NON-NLS-2$
-				+ ",rsContainerID=" + rsContainer.getContainer().getID()); //$NON-NLS-1$
 		// Get interfaces from endpoint description
 		Collection<String> interfaces = endpointDescription.getInterfaces();
 		Assert.isNotNull(interfaces);