Fix an NPE in the New Project Wizard when no test project is specified

on the second NPW page.

1 files changed, 4 insertions, 4 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/NewProjectWizard.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/NewProjectWizard.java
index 71e64dc..d8989c2 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/NewProjectWizard.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newproject/NewProjectWizard.java
@@ -352,9 +352,6 @@ public class NewProjectWizard extends Wizard implements INewWizard {
         }
 
         final ProjectInfo testData = collectTestPageInfo();
-        if (mTestPage != null && testData == null) {
-            return false;
-        }
 
         // Create a monitored operation to create the actual project
         WorkspaceModifyOperation op = new WorkspaceModifyOperation() {
@@ -439,9 +436,12 @@ public class NewProjectWizard extends Wizard implements INewWizard {
         if (mTestPage == null) {
             return null;
         }
-
         TestInfo info = mTestPage.getTestInfo();
 
+        if (!info.getCreateTestProject()) {
+            return null;
+        }
+
         IWorkspace workspace = ResourcesPlugin.getWorkspace();
         final IProject project = workspace.getRoot().getProject(info.getProjectName());
         final IProjectDescription description = workspace.newProjectDescription(project.getName());