Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslewis2011-05-09 00:03:43 -0400
committerslewis2011-05-09 00:03:43 -0400
commitaf4af5900a80b914ac20af1b013a06af6970bf90 (patch)
tree88ae23519e4227da2439d18673a7d9d21ccd1bfa
parentb1d116f37d46e22bc8a2374ac1bbaff108f5e740 (diff)
downloadorg.eclipse.ecf-af4af5900a80b914ac20af1b013a06af6970bf90.tar.gz
org.eclipse.ecf-af4af5900a80b914ac20af1b013a06af6970bf90.tar.xz
org.eclipse.ecf-af4af5900a80b914ac20af1b013a06af6970bf90.zip
Fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=345085
-rw-r--r--osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/AbstractHostContainerSelector.java1
-rw-r--r--osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/EndpointDescriptionLocator.java12
2 files changed, 7 insertions, 6 deletions
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/AbstractHostContainerSelector.java b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/AbstractHostContainerSelector.java
index 17cceeb9f..65fdb8141 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/AbstractHostContainerSelector.java
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/AbstractHostContainerSelector.java
@@ -39,7 +39,6 @@ import org.osgi.framework.ServiceReference;
public abstract class AbstractHostContainerSelector extends
AbstractContainerSelector {
- private static final String NODEFAULT = "<<nodefault>>"; //$NON-NLS-1$
protected String[] defaultConfigTypes;
public AbstractHostContainerSelector(String[] defaultConfigTypes) {
diff --git a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/EndpointDescriptionLocator.java b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/EndpointDescriptionLocator.java
index 81a7a6ca2..606564b59 100644
--- a/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/EndpointDescriptionLocator.java
+++ b/osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/EndpointDescriptionLocator.java
@@ -601,10 +601,12 @@ public class EndpointDescriptionLocator {
List<String> filters = PropertiesUtil.getStringPlusProperty(
getMapFromProperties(refs[i]),
EndpointListener.ENDPOINT_LISTENER_SCOPE);
- String matchingFilter = isMatch(description, filters);
- if (matchingFilter != null)
- results.add(new EndpointListenerHolder(listener, description,
- matchingFilter));
+ if (filters.size() > 0) {
+ String matchingFilter = isMatch(description, filters);
+ if (matchingFilter != null)
+ results.add(new EndpointListenerHolder(listener, description,
+ matchingFilter));
+ }
}
return (EndpointListenerHolder[]) results
.toArray(new EndpointListenerHolder[results.size()]);
@@ -612,7 +614,7 @@ public class EndpointDescriptionLocator {
private String isMatch(EndpointDescription description, List<String> filters) {
for (String filter : filters)
- if (description.matches(filter))
+ if (!"".equals(filter) && description.matches(filter))
return filter;
return null;
}

Back to the top