Fix for update ExportRegistration properties test

Change-Id: I17e1bb26f12a56ad84ac394ea3f2e2ce2c64a9c3

1 files changed, 5 insertions, 1 deletions

diff --git a/tests/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/tests/osgi/services/remoteserviceadmin/AbstractRemoteServiceRegisterTest.java b/tests/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/tests/osgi/services/remoteserviceadmin/AbstractRemoteServiceRegisterTest.java
index fce9f0f12..dffbcd606 100644
--- a/tests/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/tests/osgi/services/remoteserviceadmin/AbstractRemoteServiceRegisterTest.java
+++ b/tests/bundles/org.eclipse.ecf.tests.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/tests/osgi/services/remoteserviceadmin/AbstractRemoteServiceRegisterTest.java
@@ -254,11 +254,15 @@ public abstract class AbstractRemoteServiceRegisterTest extends
 		props.put("testonekey", "1");
 		// Actually register with default service (IConcatService) as a remote service
 		registration = registerDefaultService(props);
+		ExportReference exportRef = null;
 		Thread.sleep(REGISTER_WAIT/2);
+		for(RemoteServiceAdminEvent e: remoteServiceAdminEvents) 
+			if (e.getType() == RemoteServiceAdminEvent.EXPORT_REGISTRATION) exportRef = e.getExportReference();
+		
+		assertTrue(exportRef != null);
 		// remoteServiceAdminEvents should have the Export registration
 		assertTrue(remoteServiceAdminEvents.size() > 0);
 		// Get ExportReference
-		ExportReference exportRef = remoteServiceAdminEvents.get(0).getExportReference();
 		EndpointDescription oldED = exportRef.getExportedEndpoint();
 		assertNotNull(oldED);
 		Map<String,?> oldEDProperties = oldED.getProperties();