Fix for bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=473580

Change-Id: I3dba5d0ae62ac7760308dd2d089de85d1e9cfd88

2 files changed, 18 insertions, 13 deletions

diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/META-INF/MANIFEST.MF b/framework/bundles/org.eclipse.ecf.remoteservice.ui/META-INF/MANIFEST.MF
index 7398420af..014213fae 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/META-INF/MANIFEST.MF
+++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.ecf.remoteservice.ui;singleton:=true
-Bundle-Version: 3.2.0.qualifier
+Bundle-Version: 3.2.100.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,
diff --git a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/EndpointDiscoveryView.java b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/EndpointDiscoveryView.java
index 9d333a79b..64ee890e1 100644
--- a/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/EndpointDiscoveryView.java
+++ b/framework/bundles/org.eclipse.ecf.remoteservice.ui/src/org/eclipse/ecf/internal/remoteservices/ui/EndpointDiscoveryView.java
@@ -114,12 +114,17 @@ public class EndpointDiscoveryView extends ViewPart {
 		clipboard = new Clipboard(viewer.getControl().getDisplay());
 		getSite().setSelectionProvider(viewer);
 
-		IEndpointDescriptionLocator locator = this.discovery.getEndpointDescriptionLocator();
-		if (locator != null) {
-			EndpointDescription[] eds = locator.getDiscoveredEndpoints();
-			for(EndpointDescription ed: eds)
-				addEndpoint(ed);
-		}
+		// Add any previously discovered endpoints
+		viewer.getControl().getDisplay().asyncExec(new Runnable() {
+			@Override
+			public void run() {
+				IEndpointDescriptionLocator locator = discovery.getEndpointDescriptionLocator();
+				if (locator != null) {
+					EndpointDescription[] eds = locator.getDiscoveredEndpoints();
+					for(EndpointDescription ed: eds)
+						handleEndpointDescription(EndpointEvent.ADDED, ed);
+				}
+			}});
 		
 		showServicesInRegistryBrowser();
 		
@@ -440,15 +445,11 @@ public class EndpointDiscoveryView extends ViewPart {
 		viewer.getControl().setFocus();
 	}
 
-	void handleEndpointChanged(final EndpointEvent event) {
-		if (viewer == null)
-			return;
+	void handleEndpointDescription(final int type, final EndpointDescription ed) {
+		if (ed == null || viewer == null) return;
 		viewer.getControl().getDisplay().asyncExec(new Runnable() {
 			@Override
 			public void run() {
-				EndpointDescription ed = (EndpointDescription) event
-						.getEndpoint();
-				int type = event.getType();
 				switch (type) {
 				case EndpointEvent.ADDED:
 					addEndpoint(ed);
@@ -462,6 +463,10 @@ public class EndpointDiscoveryView extends ViewPart {
 			}
 		});
 	}
+	
+	void handleEndpointChanged(final EndpointEvent event) {
+		handleEndpointDescription(event.getType(),(EndpointDescription) event.getEndpoint());
+	}
 
 	void addEndpoint(EndpointDescription ed) {
 		if (EndpointDiscoveryView.this.previousRegistryBrowserGroupBy != RegistryBrowser.SERVICES)