diff options
| author | Carsten Reckord | 2015-05-28 09:58:40 +0000 |
|---|---|---|
| committer | Carsten Reckord | 2015-05-28 09:58:40 +0000 |
| commit | 784609075c11ab339e551920720bcebf6b332fae (patch) | |
| tree | 1954f6a79b8c58492cc001cb3670ad3cf89629d1 | |
| parent | 99b33ee144ad54897eb389f1123a3caa9430f4e1 (diff) | |
| download | org.eclipse.epp.mpc-784609075c11ab339e551920720bcebf6b332fae.tar.gz org.eclipse.epp.mpc-784609075c11ab339e551920720bcebf6b332fae.tar.xz org.eclipse.epp.mpc-784609075c11ab339e551920720bcebf6b332fae.zip | |
463951: NPE in SelectionModel.computeChildren (146)
Bug: 463951
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=463951
2 files changed, 8 insertions, 6 deletions
diff --git a/org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceNodeCatalogItem.java b/org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceNodeCatalogItem.java index 1fb81f14..5938d8fc 100644 --- a/org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceNodeCatalogItem.java +++ b/org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/catalog/MarketplaceNodeCatalogItem.java @@ -35,7 +35,7 @@ public class MarketplaceNodeCatalogItem extends CatalogItem { private URL marketplaceUrl; - private List<MarketplaceNodeInstallableUnitItem> installableUnitItems; + private List<MarketplaceNodeInstallableUnitItem> installableUnitItems = new ArrayList<MarketplaceNodeInstallableUnitItem>(); @Override public void setInstallableUnits(List<String> installableUnits) { diff --git a/org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/wizards/SelectionModel.java b/org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/wizards/SelectionModel.java index 41ccee1e..340f7451 100644 --- a/org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/wizards/SelectionModel.java +++ b/org.eclipse.epp.mpc.ui/src/org/eclipse/epp/internal/mpc/ui/wizards/SelectionModel.java @@ -143,11 +143,13 @@ public class SelectionModel { private void computeChildren(CatalogItemEntry itemEntry) { List<FeatureEntry> children = new ArrayList<FeatureEntry>(); List<MarketplaceNodeInstallableUnitItem> iuItems = ((MarketplaceNodeCatalogItem) itemEntry.getItem()).getInstallableUnitItems(); - for (MarketplaceNodeInstallableUnitItem iuItem : iuItems) { - FeatureEntry featureEntry = new FeatureEntry(itemEntry, iuItem); - featureEntry.setInstalled(computeInstalled(featureEntry)); - featureEntry.setChecked(computeInitiallyChecked(featureEntry)); - children.add(featureEntry); + if (iuItems != null) { + for (MarketplaceNodeInstallableUnitItem iuItem : iuItems) { + FeatureEntry featureEntry = new FeatureEntry(itemEntry, iuItem); + featureEntry.setInstalled(computeInstalled(featureEntry)); + featureEntry.setChecked(computeInitiallyChecked(featureEntry)); + children.add(featureEntry); + } } itemEntry.children = children; } |