diff options
| author | DJ Houghton | 2011-12-08 21:08:11 +0000 |
|---|---|---|
| committer | DJ Houghton | 2011-12-08 21:08:11 +0000 |
| commit | ded2ce8d449779b448e3cd04695503e3aa54c3c8 (patch) | |
| tree | c64267c128c6df63dbcb5203417e758bfa2af313 | |
| parent | e7751bddbe2ec653d48da730f5411b839c4c0f5c (diff) | |
| download | rt.equinox.p2-ded2ce8d449779b448e3cd04695503e3aa54c3c8.tar.gz rt.equinox.p2-ded2ce8d449779b448e3cd04695503e3aa54c3c8.tar.xz rt.equinox.p2-ded2ce8d449779b448e3cd04695503e3aa54c3c8.zip | |
Bug 364221 - JREAction fails for OSGi/Minimum profilesv20111208-2108
| -rw-r--r-- | bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/JREAction.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/JREAction.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/JREAction.java index 48696996f..44e08cf27 100644 --- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/JREAction.java +++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/actions/JREAction.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2010 Code 9 and others. All rights reserved. This + * Copyright (c) 2008, 2011 Code 9 and others. All rights reserved. This * program and the accompanying materials are made available under the terms of * the Eclipse Public License v1.0 which accompanies this distribution, and is * available at http://www.eclipse.org/legal/epl-v10.html @@ -111,8 +111,12 @@ public class JREAction extends AbstractPublisherAction { if (profileProperties == null) return new IProvidedCapability[0]; + String packages = profileProperties.get(PROFILE_SYSTEM_PACKAGES); + if (packages == null || (packages.trim().length() == 0)) + return new IProvidedCapability[] {PublisherHelper.createSelfCapability(id, version)}; + try { - ManifestElement[] jrePackages = ManifestElement.parseHeader(PROFILE_SYSTEM_PACKAGES, profileProperties.get(PROFILE_SYSTEM_PACKAGES)); + ManifestElement[] jrePackages = ManifestElement.parseHeader(PROFILE_SYSTEM_PACKAGES, packages); IProvidedCapability[] exportedPackageAsCapabilities = new IProvidedCapability[jrePackages.length + 1]; exportedPackageAsCapabilities[0] = PublisherHelper.createSelfCapability(id, version); for (int i = 1; i <= jrePackages.length; i++) { |