diff options
| author | jlanuti | 2006-03-06 20:49:38 +0000 |
|---|---|---|
| committer | jlanuti | 2006-03-06 20:49:38 +0000 |
| commit | 151339a0890bb3d25a32288eeb3f2f94ae6b54c7 (patch) | |
| tree | d863c2d59941d4a003f794f4bbe14affa6f09186 | |
| parent | 2f9f3abf216a1bb8e282c81ae72851529b67a72f (diff) | |
| download | webtools.javaee-151339a0890bb3d25a32288eeb3f2f94ae6b54c7.tar.gz webtools.javaee-151339a0890bb3d25a32288eeb3f2f94ae6b54c7.tar.xz webtools.javaee-151339a0890bb3d25a32288eeb3f2f94ae6b54c7.zip | |
[128323] null guards add for comp and comp type
| -rw-r--r-- | plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEComponentProjectMigrator.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEComponentProjectMigrator.java b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEComponentProjectMigrator.java index f5c0fd5b5..8290fb0d7 100644 --- a/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEComponentProjectMigrator.java +++ b/plugins/org.eclipse.jst.j2ee.ui/j2ee_ui/org/eclipse/jst/j2ee/internal/J2EEComponentProjectMigrator.java @@ -107,7 +107,8 @@ public class J2EEComponentProjectMigrator implements IComponentProjectMigrator { e.printStackTrace(); } } - addFacetsToProject(newProj,comp.getComponentType().getComponentTypeId(),comp.getComponentType().getVersion(),false); + if (comp!=null && comp.getComponentType()!=null) + addFacetsToProject(newProj,comp.getComponentType().getComponentTypeId(),comp.getComponentType().getVersion(),false); removedComps.add(comp); IFolder compFolder = project.getFolder(comp.getName()); if (compFolder.exists()) |