summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Sahagun2012-09-05 16:36:16 (EDT)
committer Roberto Sanchez2012-09-05 16:36:16 (EDT)
commit0fdc45fa9371cf3c2c592a9f73cca7618e9bff7d (patch)
tree2ccae701e6950f65bb491305ebfb46c648a2fded
parent1523bbd63dfb8fb3c0f2c87aff45a9a010f44f8e (diff)
downloadwebtools.javaee-0fdc45fa9371cf3c2c592a9f73cca7618e9bff7d.zip
webtools.javaee-0fdc45fa9371cf3c2c592a9f73cca7618e9bff7d.tar.gz
webtools.javaee-0fdc45fa9371cf3c2c592a9f73cca7618e9bff7d.tar.bz2
[387939] NPE when modules of an EAR have no archive name in the .component file
-rw-r--r--plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathContainer.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathContainer.java b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathContainer.java
index 803e874..c58d438 100644
--- a/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathContainer.java
+++ b/plugins/org.eclipse.jst.j2ee/common/org/eclipse/jst/j2ee/internal/common/classpath/J2EEComponentClasspathContainer.java
@@ -441,7 +441,7 @@ public class J2EEComponentClasspathContainer implements IClasspathContainer {
// check if the referenced component is in the library directory
IPath runtimePath = earRef.getRuntimePath().makeRelative();
boolean isInLibDir = libDirPath.equals(runtimePath);
- if(!isInLibDir){
+ if(!isInLibDir && earRef.getArchiveName() != null){
IPath fullPath = earRef.getRuntimePath().append(earRef.getArchiveName());
isInLibDir = fullPath.removeLastSegments(1).makeRelative().equals(libDirPath);
}