| commit | e478ef8517f47a3e95c7a5fcaf555c43340bee9e | [log] [tgz] |
|---|---|---|
| author | rsanchez <rsanchez> | Wed Oct 05 16:32:26 2011 +0000 |
| committer | rsanchez <rsanchez> | Wed Oct 05 16:32:26 2011 +0000 |
| tree | b14fadfd5566451be2dc4838daf79a249af851d2 | |
| parent | 90341a1c4e9bacbc45f67f402d5ebc3de6eb5a6d [diff] |
[359927] FacetProjectCreationDataModelProvider should have a null check for model in dispose method
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/datamodel/FacetProjectCreationDataModelProvider.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/datamodel/FacetProjectCreationDataModelProvider.java index 77e58ab..3f0001a 100644 --- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/datamodel/FacetProjectCreationDataModelProvider.java +++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/datamodel/FacetProjectCreationDataModelProvider.java
@@ -161,9 +161,11 @@ } fpjwc.dispose(); } - IDataModel nestedProjectDM = model.getNestedModel(NESTED_PROJECT_DM); - if (nestedProjectDM != null){ - nestedProjectDM.removeListener(dataModelListener); + if (model != null){ + IDataModel nestedProjectDM = model.getNestedModel(NESTED_PROJECT_DM); + if (nestedProjectDM != null){ + nestedProjectDM.removeListener(dataModelListener); + } } setDataModel(null); super.dispose();