added null checking: committed for JL
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ArtifactEditModel.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ArtifactEditModel.java
index feb672b..bb2632e 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ArtifactEditModel.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ArtifactEditModel.java
@@ -18,7 +18,6 @@
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.UnresolveableURIException;
import org.eclipse.wst.common.componentcore.internal.impl.PlatformURLModuleConnection;
import org.eclipse.wst.common.componentcore.resources.ComponentHandle;
import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
@@ -242,21 +241,21 @@
Resource resourceToProcess;
boolean processed = false;
- URI aResourceURI = null;
IResource resourceResource;
- IVirtualResource[] resources;
+ IVirtualResource[] virtualResources;
for (int i = 0; i < size; i++) {
resourceToProcess = (Resource) theResources.get(i);
- aResourceURI = resourceToProcess.getURI();
+ resourceToProcess.getURI();
resourceResource = WorkbenchResourceHelper.getFile(resourceToProcess);
- resources = ComponentCore.createResources(resourceResource);
- for (int resourcesIndex = 0; resourcesIndex < resources.length; resourcesIndex++) {
- if (virtualComponent.equals(resources[resourcesIndex].getComponent())) {
+ if (resourceResource == null)
+ return processed;
+ virtualResources = ComponentCore.createResources(resourceResource);
+ for (int resourcesIndex = 0; resourcesIndex < virtualResources.length; resourcesIndex++) {
+ if (virtualComponent.equals(virtualResources[resourcesIndex].getComponent())) {
processResource(resourceToProcess);
processed = true;
}
}
-
}
return processed;
}
