Skip to content

Commit 712d565

Browse files
committed
Add null check when getting fragment host wire provider
If the host is missing or does not build an NPE occurred (issue #1819)
1 parent fd1002d commit 712d565

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/DependencyManager.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
import org.eclipse.core.resources.IResource;
2929
import org.eclipse.core.runtime.CoreException;
30+
import org.eclipse.core.runtime.ILog;
3031
import org.eclipse.osgi.service.resolver.BundleDescription;
3132
import org.eclipse.osgi.service.resolver.State;
3233
import org.eclipse.pde.core.plugin.IPluginModelBase;
@@ -206,7 +207,12 @@ public static Set<BundleDescription> findRequirementsClosure(Collection<BundleDe
206207
// to ensure it's added again below. In the subsequent
207208
// processing this fragment's requirements will then also be
208209
// considered (before it was discarded).
209-
closure.remove(hostWire.getProvider());
210+
if(hostWire.getProviderWiring() != null) {
211+
closure.remove(hostWire.getProvider());
212+
} else {
213+
ILog.of(DependencyManager.class).error(
214+
String.format("Error resolving host of %s", wiring.getRevision().getSymbolicName())); //$NON-NLS-1$
215+
}
210216
}
211217
}
212218

0 commit comments

Comments
 (0)