[102332], partial fix for this defect
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentCoreURIConverter.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentCoreURIConverter.java
index 2b0c11b..f6bf84c 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentCoreURIConverter.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/impl/ComponentCoreURIConverter.java
@@ -85,7 +85,9 @@
if (moduleCore != null)
moduleCore.dispose();
}
- return ComponentCore.createComponent(containingProject, module.getName());
+ if( module != null )
+ return ComponentCore.createComponent(containingProject, module.getName());
+ return null;
}
/* (non-Javadoc)
* @see org.eclipse.jem.util.emf.workbench.WorkbenchURIConverterImpl#normalize(org.eclipse.emf.common.util.URI)
@@ -139,10 +141,13 @@
if (aFile != null) {
IVirtualComponent component = findComponent(aFile);
- IProject fileProject = aFile.getProject();
- //If it is not in the same project then just return the URI as is.
- if (resourceSetSynchronizer.getProject() == fileProject)
- return getArchiveRelativeURI(aFile,component.getRootFolder().getUnderlyingFolder());
+ if (component != null) {
+ IProject fileProject = aFile.getProject();
+ //If it is not in the same project then just return the URI as is.
+ if (resourceSetSynchronizer.getProject() == fileProject)
+ return getArchiveRelativeURI(aFile,component.getRootFolder().getUnderlyingFolder());
+ } else
+ return super.deNormalize(uri);
}
}
return uri;
