Restore check if a BundleComponent has explicitly declared its EE

And assume no EE if that check is positive. Fixes eclipse-pde#1386
HannesWell · Sep 5, 2024 · cfe324d · cfe324d
1 parent 5bff9b3
commit cfe324d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/...g.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/BundleComponent.java b/...g.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/BundleComponent.java
@@ -75,6 +75,7 @@
 import org.eclipse.pde.api.tools.internal.provisional.model.IApiTypeContainer;
 import org.eclipse.pde.api.tools.internal.util.SourceDefaultHandler;
 import org.eclipse.pde.api.tools.internal.util.Util;
+import org.eclipse.pde.internal.core.MinimalState;
 import org.eclipse.pde.internal.core.TargetWeaver;
 import org.eclipse.pde.internal.core.util.ManifestUtils;
 import org.osgi.framework.Bundle;
@@ -310,7 +311,9 @@ protected void init() throws CoreException {
 				BundleDescription bundleDescription = getBundleDescription(manifest, fLocation, fBundleId);
 				fSymbolicName = bundleDescription.getSymbolicName();
 				fVersion = bundleDescription.getVersion();
-				fdeclaredRequiredEE = ManifestUtils.getRequiredExecutionEnvironments(bundleDescription).toArray(String[]::new);
+				fdeclaredRequiredEE = MinimalState.hasDeclaredRequiredEE(manifest)
+						? ManifestUtils.getRequiredExecutionEnvironments(bundleDescription).toArray(String[]::new)
+						: new String[0];
 				setName(manifest.get(Constants.BUNDLE_NAME));
 				fBundleDescription = bundleDescription;
 			} catch (BundleException e) {

diff --git a/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/MinimalState.java b/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/MinimalState.java
@@ -161,7 +161,7 @@ private Map<String, String> loadWorkspaceBundleManifest(File bundleLocation, IRe
 	}
 
 	@SuppressWarnings("deprecation")
-	private boolean hasDeclaredRequiredEE(Map<String, String> manifest) {
+	public static boolean hasDeclaredRequiredEE(Map<String, String> manifest) {
 		if (manifest.containsKey(Constants.BUNDLE_REQUIREDEXECUTIONENVIRONMENT)) {
 			return true;
 		}