Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2006-08-23 09:54:28 -0400
committerThomas Watson2006-08-23 09:54:28 -0400
commitd3c1fa525ccd85eb29a6c8ab42bf39c31904d6ca (patch)
tree20c35ad89f49641195cd085bd0db1f71aeb354ff
parentea0631b0b0064ef9d5c299f72f886430b975ee44 (diff)
downloadrt.equinox.framework-d3c1fa525ccd85eb29a6c8ab42bf39c31904d6ca.tar.gz
rt.equinox.framework-d3c1fa525ccd85eb29a6c8ab42bf39c31904d6ca.tar.xz
rt.equinox.framework-d3c1fa525ccd85eb29a6c8ab42bf39c31904d6ca.zip
Bug 154137 StateObjectFactoryImpl.createBundleDescription ingores executionEnvironment
-rw-r--r--bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateObjectFactoryImpl.java7
1 files changed, 7 insertions, 0 deletions
diff --git a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateObjectFactoryImpl.java b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateObjectFactoryImpl.java
index ab71b23c0..67b506531 100644
--- a/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateObjectFactoryImpl.java
+++ b/bundles/org.eclipse.osgi/resolver/src/org/eclipse/osgi/internal/resolver/StateObjectFactoryImpl.java
@@ -15,6 +15,7 @@ import java.util.*;
import org.eclipse.osgi.framework.internal.core.Constants;
import org.eclipse.osgi.internal.module.ResolverImpl;
import org.eclipse.osgi.service.resolver.*;
+import org.eclipse.osgi.util.ManifestElement;
import org.osgi.framework.*;
public class StateObjectFactoryImpl implements StateObjectFactory {
@@ -34,6 +35,11 @@ public class StateObjectFactoryImpl implements StateObjectFactory {
}
public BundleDescription createBundleDescription(long id, String symbolicName, Version version, String location, BundleSpecification[] required, HostSpecification host, ImportPackageSpecification[] imports, ExportPackageDescription[] exports, String[] providedPackages, boolean singleton, boolean attachFragments, boolean dynamicFragments, String platformFilter, String executionEnvironment, GenericSpecification[] genericRequires, GenericDescription[] genericCapabilities) {
+ // bug 154137 we need to parse the executionEnvironment param; no need to check for null, ManifestElement does that for us.
+ return createBundleDescription(id, symbolicName, version, location, required, host, imports, exports, singleton, attachFragments, dynamicFragments, platformFilter, ManifestElement.getArrayFromList(executionEnvironment), genericRequires, genericCapabilities);
+ }
+
+ public BundleDescription createBundleDescription(long id, String symbolicName, Version version, String location, BundleSpecification[] required, HostSpecification host, ImportPackageSpecification[] imports, ExportPackageDescription[] exports, boolean singleton, boolean attachFragments, boolean dynamicFragments, String platformFilter, String[] executionEnvironments, GenericSpecification[] genericRequires, GenericDescription[] genericCapabilities) {
BundleDescriptionImpl bundle = new BundleDescriptionImpl();
bundle.setBundleId(id);
bundle.setSymbolicName(symbolicName);
@@ -47,6 +53,7 @@ public class StateObjectFactoryImpl implements StateObjectFactory {
bundle.setStateBit(BundleDescriptionImpl.ATTACH_FRAGMENTS, attachFragments);
bundle.setStateBit(BundleDescriptionImpl.DYNAMIC_FRAGMENTS, dynamicFragments);
bundle.setPlatformFilter(platformFilter);
+ bundle.setExecutionEnvironments(executionEnvironments);
bundle.setGenericRequires(genericRequires);
bundle.setGenericCapabilities(genericCapabilities);
return bundle;

Back to the top