481893 : prevent NPE when closing ArchetypePage

Change-Id: I86d0bedff898932ac2b79a26666ee9ff75096051
Signed-off-by: Fred Bricon <fbricon@gmail.com>

1 files changed, 3 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 82ae8cd6..5a470ebb 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
@@ -145,7 +145,7 @@ public class MavenProjectWizardArchetypePage extends AbstractMavenWizardPage imp
 
   private static final boolean DEFAULT_INCLUDE_SNAPSHOTS = false;
 
-  private Map<String, List<Archetype>> archetypesCache;
+  private Map<String, List<Archetype>> archetypesCache = new HashMap<>();
 
   ComboViewer catalogsComboViewer;
 
@@ -191,7 +191,7 @@ public class MavenProjectWizardArchetypePage extends AbstractMavenWizardPage imp
 
   /** Creates the page controls. */
   public void createControl(Composite parent) {
-    archetypesCache = new HashMap<>();
+    archetypesCache.clear();
     Composite composite = new Composite(parent, SWT.NONE);
     composite.setLayout(new GridLayout(3, false));
 
@@ -543,7 +543,7 @@ public class MavenProjectWizardArchetypePage extends AbstractMavenWizardPage imp
       job = null;
     }
     MavenPlugin.getIndexManager().removeIndexListener(this);
-    archetypesCache = null;
+    archetypesCache.clear();
     super.dispose();
   }