459351 : make catalog change detection more robust

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

1 files changed, 2 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 d9882d08..af966cec 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
@@ -20,6 +20,7 @@ import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.TreeSet;
 
@@ -252,10 +253,8 @@ public class MavenProjectWizardArchetypePage extends AbstractMavenWizardPage imp
           ArchetypeCatalogFactory newCatalogFactory = null;
           if(factory instanceof ArchetypeCatalogFactory) {
             newCatalogFactory = (ArchetypeCatalogFactory) factory;
-          } else if(factory instanceof String) {
-            newCatalogFactory = null;
           }
-          if(catalogFactory != null && catalogFactory.equals(newCatalogFactory) && viewer.getInput() != null) {
+          if(Objects.equals(catalogFactory, newCatalogFactory) && viewer.getInput() != null) {
             return;
           }
           catalogFactory = newCatalogFactory;