[360265] Exception when creating a new Dynamic Web Project with project name as empty

4 files changed, 12 insertions, 8 deletions

diff --git a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/internal/jca/project/facet/ConnectorFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/internal/jca/project/facet/ConnectorFacetInstallDataModelProvider.java
index c87701d29..c82cdb2ef 100644
--- a/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/internal/jca/project/facet/ConnectorFacetInstallDataModelProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.jca/jca/org/eclipse/jst/j2ee/internal/jca/project/facet/ConnectorFacetInstallDataModelProvider.java
@@ -39,8 +39,9 @@ public class ConnectorFacetInstallDataModelProvider extends J2EEModuleFacetInsta
 			if (model.isPropertySet(FACET_PROJECT_NAME))
 			{
 				String projectName = model.getStringProperty(FACET_PROJECT_NAME);
-				IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-				if (project.exists()) {
+				IProject project = (projectName.length() > 0) ? ResourcesPlugin.getWorkspace().getRoot().getProject(projectName) : null;
+				
+				if (project != null && project.exists()) {
 					if (ModuleCoreNature.isFlexibleProject(project))
 					{
 						IVirtualComponent c = ComponentCore.createComponent(project, true);
diff --git a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDataModelProvider.java
index 3d7bf70fc..b696c7b5a 100644
--- a/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDataModelProvider.java
+++ b/plugins/org.eclipse.jst.j2ee.web/webproject/org/eclipse/jst/j2ee/web/project/facet/WebFacetInstallDataModelProvider.java
@@ -66,8 +66,9 @@ public class WebFacetInstallDataModelProvider extends J2EEModuleFacetInstallData
 			if (model.isPropertySet(FACET_PROJECT_NAME))
 			{
 				String projectName = model.getStringProperty(FACET_PROJECT_NAME);
-				IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-				if (project.exists()) {
+				IProject project = (projectName.length() > 0) ? ResourcesPlugin.getWorkspace().getRoot().getProject(projectName) : null;
+				
+				if (project != null && project.exists()) {
 					if (ModuleCoreNature.isFlexibleProject(project))
 					{
 						IVirtualComponent c = ComponentCore.createComponent(project, true);
diff --git a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDataModelProvider.java
index 02d822be4..999b6b584 100644
--- a/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDataModelProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/appclientcreation/org/eclipse/jst/j2ee/project/facet/AppClientFacetInstallDataModelProvider.java
@@ -53,8 +53,9 @@ public class AppClientFacetInstallDataModelProvider extends J2EEModuleFacetInsta
 			if (model.isPropertySet(FACET_PROJECT_NAME))
 			{
 				String projectName = model.getStringProperty(FACET_PROJECT_NAME);
-				IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-				if (project.exists()) {
+				IProject project = (projectName.length() > 0) ? ResourcesPlugin.getWorkspace().getRoot().getProject(projectName) : null;
+				
+				if (project != null && project.exists()) {
 					if (ModuleCoreNature.isFlexibleProject(project))
 					{
 						IVirtualComponent c = ComponentCore.createComponent(project, true);
diff --git a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EarFacetInstallDataModelProvider.java b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EarFacetInstallDataModelProvider.java
index b1aa69838..e87cc5d02 100644
--- a/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EarFacetInstallDataModelProvider.java
+++ b/plugins/org.eclipse.jst.j2ee/earproject/org/eclipse/jst/j2ee/internal/earcreation/EarFacetInstallDataModelProvider.java
@@ -53,8 +53,9 @@ public class EarFacetInstallDataModelProvider extends J2EEFacetInstallDataModelP
 			if (model.isPropertySet(FACET_PROJECT_NAME))
 			{
 				String projectName = model.getStringProperty(FACET_PROJECT_NAME);
-				IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
-				if (project.exists()) {
+				IProject project = (projectName.length() > 0) ? ResourcesPlugin.getWorkspace().getRoot().getProject(projectName) : null;
+				
+				if (project != null && project.exists()) {
 					if (ModuleCoreNature.isFlexibleProject(project))
 					{
 						IVirtualComponent c = ComponentCore.createComponent(project, true);