Small refactoring
Project: http://git-wip-us.apache.org/repos/asf/aries-rsa/repo Commit: http://git-wip-us.apache.org/repos/asf/aries-rsa/commit/8a0b96e0 Tree: http://git-wip-us.apache.org/repos/asf/aries-rsa/tree/8a0b96e0 Diff: http://git-wip-us.apache.org/repos/asf/aries-rsa/diff/8a0b96e0 Branch: refs/heads/master Commit: 8a0b96e004186cf8e19176139c864a33c4e5bc13 Parents: 9c74635 Author: Christian Schneider <[email protected]> Authored: Mon Nov 27 14:58:35 2017 +0100 Committer: Christian Schneider <[email protected]> Committed: Mon Nov 27 14:58:35 2017 +0100 ---------------------------------------------------------------------- .../topologymanager/exporter/TopologyManagerExport.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/aries-rsa/blob/8a0b96e0/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/exporter/TopologyManagerExport.java ---------------------------------------------------------------------- diff --git a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/exporter/TopologyManagerExport.java b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/exporter/TopologyManagerExport.java index 0be28a4..e11801c 100644 --- a/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/exporter/TopologyManagerExport.java +++ b/topology-manager/src/main/java/org/apache/aries/rsa/topologymanager/exporter/TopologyManagerExport.java @@ -120,10 +120,8 @@ public class TopologyManagerExport implements ServiceListener { for (RemoteServiceAdmin remoteServiceAdmin : rsaSetCopy) { LOG.debug("TopologyManager: handling remoteServiceAdmin " + remoteServiceAdmin); if (endpointRepo.isAlreadyExportedForRsa(sref, remoteServiceAdmin)) { - // already handled by this remoteServiceAdmin LOG.debug("already handled by this remoteServiceAdmin -> skipping"); } else { - exportServiceUsingRemoteServiceAdmin(sref, remoteServiceAdmin, addProps); } } @@ -132,9 +130,11 @@ public class TopologyManagerExport implements ServiceListener { private boolean shouldExport(ServiceReference<?> sref, Map<String, ?> addProps) { List<String> exported= StringPlus.normalize(sref.getProperty(RemoteConstants.SERVICE_EXPORTED_INTERFACES)); List<String> addExported = StringPlus.normalize(addProps.get(RemoteConstants.SERVICE_EXPORTED_INTERFACES)); - int length = exported == null ? 0 : exported.size(); - length += addExported == null ? 0 : addExported.size(); - return length>0; + return sizeOf(exported) + sizeOf(addExported) > 0; + } + + private int sizeOf(List<String> list) { + return list == null ? 0 : list.size(); } private Object getSymbolicName(Bundle bundle) { @@ -151,7 +151,7 @@ public class TopologyManagerExport implements ServiceListener { endpointRepo.removeService(sref); return; } - // do the export + LOG.debug("exporting {}...", sref); // TODO: additional parameter Map? Collection<ExportRegistration> exportRegs = remoteServiceAdmin.exportService(sref, addProps);
