Move native selection-filter check out of ModuleDatabase and use configuration to match against.

1 files changed, 0 insertions, 22 deletions

diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/Capabilities.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/Capabilities.java
index d68341734..e5fa25b9c 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/Capabilities.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/internal/container/Capabilities.java
@@ -14,10 +14,8 @@ import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import org.eclipse.osgi.container.*;
-import org.eclipse.osgi.container.namespaces.EquinoxNativeCodeNamespace;
 import org.eclipse.osgi.internal.framework.FilterImpl;
 import org.eclipse.osgi.util.ManifestElement;
-import org.osgi.framework.Filter;
 import org.osgi.framework.InvalidSyntaxException;
 import org.osgi.framework.namespace.*;
 import org.osgi.resource.Capability;
@@ -150,29 +148,9 @@ public class Capabilities {
 					}
 				}
 			}
-			// if this is native code need to check selection filter
-			checkNativeSelectionFilter(requirement, result);
 			return result;
 		}
 
-		private void checkNativeSelectionFilter(ModuleRequirement requirement, List<ModuleCapability> result) {
-			if (EquinoxNativeCodeNamespace.EQUINOX_NATIVECODE_NAMESPACE.equals(name)) {
-				String filterSpec = requirement.getDirectives().get(EquinoxNativeCodeNamespace.REQUIREMENT_SELECTION_FILTER_DIRECTIVE);
-				if (filterSpec != null) {
-					try {
-						Filter f = FilterImpl.newInstance(filterSpec);
-						@SuppressWarnings("rawtypes")
-						Dictionary properties = System.getProperties();
-						if (!f.matchCase(properties)) {
-							result.clear();
-						}
-					} catch (InvalidSyntaxException e) {
-						result.clear();
-					}
-				}
-			}
-		}
-
 		private List<ModuleCapability> match(FilterImpl f, Set<ModuleCapability> candidates) {
 			List<ModuleCapability> result = new ArrayList<ModuleCapability>(1);
 			for (ModuleCapability candidate : candidates) {