395147:The data from the pages of New Maven Project wizard is not persisted

Changes to be committed:
	modified: MavenProjectWizardArchetypePage.java

- I wrote 100% of the code
- I have the right to contribute the code to Eclipse
- I have updated the header

1 files changed, 6 insertions, 3 deletions

diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypePage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypePage.java
index 708d5448..92248242 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypePage.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypePage.java
@@ -252,8 +252,11 @@ public class MavenProjectWizardArchetypePage extends AbstractMavenWizardPage imp
           loadArchetypes(null, null, null);
         }
         //remember what was switched to here
-        if(dialogSettings != null && catalogFactory != null) {
-          dialogSettings.put(KEY_CATALOG, catalogFactory.getId());
+        if(dialogSettings != null) {
+          if(catalogFactory != null)
+            dialogSettings.put(KEY_CATALOG, catalogFactory.getId());
+          else
+            dialogSettings.put(KEY_CATALOG, ALL_CATALOGS);
         }
       }
     });
@@ -629,7 +632,7 @@ public class MavenProjectWizardArchetypePage extends AbstractMavenWizardPage imp
       ArchetypeManager archetypeManager = MavenPluginActivator.getDefault().getArchetypeManager();
       String catalogId = dialogSettings.get(KEY_CATALOG);
       catalogFactory = null;
-      if(catalogId != null) {
+      if(catalogId != null && !catalogId.equals(ALL_CATALOGS)) {
         catalogFactory = archetypeManager.getArchetypeCatalogFactory(catalogId);
       }
       catalogsComboViewer.setSelection(new StructuredSelection(catalogFactory == null ? ALL_CATALOGS : catalogFactory));