Fixed NPE in DiscoveryView. Added registerServiceType(String) to IDiscoveryContainer

2 files changed, 8 insertions, 2 deletions

diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryContainer.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryContainer.java
index 3c3192486..0aca1e7d0 100644
--- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryContainer.java
+++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/discovery/IDiscoveryContainer.java
@@ -68,6 +68,13 @@ public interface IDiscoveryContainer {
 	 */
 	public void registerServiceType(ServiceID serviceType);
 	/**
+	 * Register the given service type.  This publishes the given service type to the
+	 * underlying publishing mechanism
+	 * 
+	 * @param serviceType the String of the type to be published
+	 */
+	public void registerServiceType(String serviceType);
+	/**
 	 * Register the given service.  This publishes the service defined by the first parameter to the
 	 * underlying publishing mechanism
 	 * 
diff --git a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/DiscoveryView.java b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/DiscoveryView.java
index 4d793f008..610e76e3d 100644
--- a/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/DiscoveryView.java
+++ b/framework/bundles/org.eclipse.ecf.ui/src/org/eclipse/ecf/ui/views/DiscoveryView.java
@@ -350,9 +350,8 @@ public class DiscoveryView extends ViewPart {
                 TreeObject treeObject = getSelectedTreeObject();
                 if (treeObject instanceof TreeParent) {
                 	TreeParent p = (TreeParent) treeObject;
-                    final ServiceID targetID = p.getID();
                     if (container != null) {
-                    	container.registerServiceType(targetID);
+                    	container.registerServiceType(p.getName());
                     }
                 }
             }