diff options
| author | slewis | 2011-05-09 14:50:56 +0000 |
|---|---|---|
| committer | slewis | 2011-05-09 14:50:56 +0000 |
| commit | 186040c2e5107d13a13c56259c99dc6e2a16b6c0 (patch) | |
| tree | e120e1c09d0707931d40ca770844a5ca8a938095 /osgi | |
| parent | af4af5900a80b914ac20af1b013a06af6970bf90 (diff) | |
| download | org.eclipse.ecf-186040c2e5107d13a13c56259c99dc6e2a16b6c0.tar.gz org.eclipse.ecf-186040c2e5107d13a13c56259c99dc6e2a16b6c0.tar.xz org.eclipse.ecf-186040c2e5107d13a13c56259c99dc6e2a16b6c0.zip | |
Improved fix for https://bugs.eclipse.org/bugs/show_bug.cgi?id=345085
Diffstat (limited to 'osgi')
| -rw-r--r-- | osgi/bundles/org.eclipse.ecf.osgi.services.remoteserviceadmin/src/org/eclipse/ecf/osgi/services/remoteserviceadmin/EndpointDescriptionLocator.java | 10 |
1 files changed, 7 insertions, 3 deletions
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 606564b59..7348a2885 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 @@ -613,9 +613,13 @@ public class EndpointDescriptionLocator { }
private String isMatch(EndpointDescription description, List<String> filters) {
- for (String filter : filters)
- if (!"".equals(filter) && description.matches(filter))
- return filter;
+ for (String filter : filters) {
+ try {
+ if (description.matches(filter)) return filter;
+ } catch (IllegalArgumentException e) {
+ logError("isMatch", "invalid endpoint listener filter="+filters, e);
+ }
+ }
return null;
}
|