[217642] fix ArrayIndexOutOfBoundsException
diff --git a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployableArtifactUtil.java b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployableArtifactUtil.java index 4a70e57..b8b315d 100644 --- a/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployableArtifactUtil.java +++ b/plugins/org.eclipse.jst.j2ee.web/web/org/eclipse/jst/j2ee/internal/web/deployables/WebDeployableArtifactUtil.java
@@ -119,8 +119,9 @@ IPath resourcePath = resource.getFullPath(); IVirtualResource[] resources = ComponentCore.createResources(resource); IVirtualComponent component = null; - if (resources[0] != null || resources.length <= 0) - component = resources[0].getComponent(); + if (resources.length <= 0 || resources[0] == null ) + return null; + component = resources[0].getComponent(); String className = getServletClassName(resource); if (className != null && component != null) { String mapping = getServletMapping(resource, true, className, component.getName());
diff --git a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/WebDeployableArtifactUtil.java b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/WebDeployableArtifactUtil.java index f83d76c..120edab 100644 --- a/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/WebDeployableArtifactUtil.java +++ b/plugins/org.eclipse.jst.jee.ui/src/org/eclipse/jst/jee/ui/internal/deployables/WebDeployableArtifactUtil.java
@@ -123,8 +123,9 @@ IPath resourcePath = resource.getFullPath(); IVirtualResource[] resources = ComponentCore.createResources(resource); IVirtualComponent component = null; - if (resources[0] != null || resources.length <= 0) - component = resources[0].getComponent(); + if (resources.length <= 0 || resources[0] == null ) + return null; + component = resources[0].getComponent(); String className = getServletClassName(resource); if (className != null && component != null) { String mapping = getServletMapping(resource, true, className, component.getName());