diff options
2 files changed, 9 insertions, 3 deletions
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java index 2c88cb7a0..10790a05f 100644 --- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java +++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/p2/publisher/eclipse/BundlesAction.java @@ -803,7 +803,7 @@ public class BundlesAction extends AbstractPublisherAction { /** * Adds advice for any p2.inf file found in this bundle. */ - private void createAdviceFileAdvice(BundleDescription bundleDescription, IPublisherInfo publisherInfo) { + protected void createAdviceFileAdvice(BundleDescription bundleDescription, IPublisherInfo publisherInfo) { String location = bundleDescription.getLocation(); if (location == null) return; diff --git a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AdviceFileParser.java b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AdviceFileParser.java index 7453ee66a..2bf051ed8 100644 --- a/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AdviceFileParser.java +++ b/bundles/org.eclipse.equinox.p2.publisher/src/org/eclipse/equinox/p2/publisher/AdviceFileParser.java @@ -259,8 +259,14 @@ public class AdviceFileParser { } next(); } - IRequirement capability = MetadataFactory.createRequirement(namespace, name, range, filter, optional, multiple, greedy); - requires.add(capability); + IRequirement capability = createRequirement(namespace, name, range, filter, optional, multiple, greedy); + if (capability != null) { + requires.add(capability); + } + } + + protected IRequirement createRequirement(String namespace, String name, VersionRange range, String filter, boolean optional, boolean multiple, boolean greedy) { + return MetadataFactory.createRequirement(namespace, name, range, filter, optional, multiple, greedy); } private void parseInstructions(String prefix, Map<String, ITouchpointInstruction> instructions) { |