diff options
author | Thomas Watson | 2012-09-20 13:12:01 +0000 |
---|---|---|
committer | Thomas Watson | 2012-09-20 14:08:04 +0000 |
commit | 0a18aee6699903748b81fadeffc92b88aee0d444 (patch) | |
tree | 0108f925dfaa58876645d9778a0b83ba85d22f80 /bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDatabase.java | |
parent | b5efc532bd6588376fd61371ab42e5ea44d7991c (diff) | |
download | rt.equinox.framework-0a18aee6699903748b81fadeffc92b88aee0d444.tar.gz rt.equinox.framework-0a18aee6699903748b81fadeffc92b88aee0d444.tar.xz rt.equinox.framework-0a18aee6699903748b81fadeffc92b88aee0d444.zip |
Use fuzzy compare ~= to match and do not lower case the attribute values for native code.
Diffstat (limited to 'bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDatabase.java')
-rw-r--r-- | bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDatabase.java | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDatabase.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDatabase.java index 570c9fd25..988b79a43 100644 --- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDatabase.java +++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleDatabase.java @@ -28,7 +28,8 @@ import org.eclipse.osgi.internal.container.ComputeNodeOrder; import org.osgi.framework.Constants; import org.osgi.framework.Version; import org.osgi.framework.wiring.BundleRevision; -import org.osgi.resource.*; +import org.osgi.resource.Requirement; +import org.osgi.resource.Wire; import org.osgi.service.resolver.Resolver; /** @@ -1092,11 +1093,11 @@ public class ModuleDatabase { writeVersion(current.getVersion(), out); out.writeInt(current.getTypes()); - List<Capability> capabilities = current.getCapabilities(null); + List<ModuleCapability> capabilities = current.getModuleCapabilities(null); out.writeInt(capabilities.size()); - for (Capability capability : capabilities) { + for (ModuleCapability capability : capabilities) { out.writeInt(addToWriteTable(capability, objectTable)); - writeGenericInfo(capability.getNamespace(), capability.getAttributes(), capability.getDirectives(), out); + writeGenericInfo(capability.getNamespace(), capability.getPersistentAttributes(), capability.getDirectives(), out); } List<Requirement> requirements = current.getRequirements(null); |