| commit | d3dfa412d7f20ca4dc540922537be8e1f3dce094 | [log] [tgz] |
|---|---|---|
| author | slewis <slewis@composent.com> | Thu Jun 12 13:08:41 2014 -0700 |
| committer | slewis <slewis@composent.com> | Thu Jun 12 13:08:41 2014 -0700 |
| tree | 406c481459d946b563b6168187b7aba44fa18766 | |
| parent | c28a9bebcf78dc077f1313504035a9db3cecbcad [diff] | |
| parent | e6a34a588cbfec3b900de463ae0568f1743d0203 [diff] |
Merge remote-tracking branch 'origin/master' into 424059 Conflicts: framework/bundles/org.eclipse.ecf.discovery/META-INF/MANIFEST.MF osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/RemoteServiceAdmin.java providers/bundles/org.eclipse.ecf.provider.filetransfer/META-INF/MANIFEST.MF merged manually by sbl Change-Id: If086dde4fffb137f44a48d183f6280f068c8eb17
diff --git a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/internal/discovery/IServiceInfoServiceListener.java b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/internal/discovery/IServiceInfoServiceListener.java index 9af6d9f..c799d29 100644 --- a/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/internal/discovery/IServiceInfoServiceListener.java +++ b/framework/bundles/org.eclipse.ecf.discovery/src/org/eclipse/ecf/internal/discovery/IServiceInfoServiceListener.java
@@ -36,6 +36,11 @@ .getService(reference); final IServiceInfo specific = convertToProviderSpecific( advertiser, serviceInfo); + if (advertiser instanceof AbstractDiscoveryContainerAdapter) { + AbstractDiscoveryContainerAdapter adca = (AbstractDiscoveryContainerAdapter) advertiser; + if (adca.getConnectedID() == null) + return null; + } advertiser.registerService(specific); return serviceInfo; }
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 115aaa0..9567048 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
@@ -2082,8 +2082,7 @@ if (remoteRegistration instanceof IExtendedRemoteServiceRegistration) { IExtendedRemoteServiceRegistration iersr = (IExtendedRemoteServiceRegistration) remoteRegistration; Map<String, Object> extraProperties = iersr.getExtraProperties(); - if (extraProperties != null) - endpointDescriptionProperties = PropertiesUtil.mergeProperties(endpointDescriptionProperties, extraProperties); + endpointDescriptionProperties = PropertiesUtil.mergeProperties(endpointDescriptionProperties, extraProperties); } // Create ExportEndpoint/ExportRegistration