Bug 340328 - Avoid early activation of m2e bundles on first run

1 files changed, 9 insertions, 2 deletions

diff --git a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/startup/UpdateConfigurationStartup.java b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/startup/UpdateConfigurationStartup.java
index e64cc46c..0470605d 100644
--- a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/startup/UpdateConfigurationStartup.java
+++ b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/startup/UpdateConfigurationStartup.java
@@ -42,8 +42,10 @@ public class UpdateConfigurationStartup implements IStartup {
   private static final String PROJECT_PREF = DiscoveryActivator.PLUGIN_ID + ".pref.projects"; //$NON-NLS-1$
 
   public void earlyStartup() {
-    final MavenPlugin plugin = MavenPlugin.getDefault();
-    new UpdateConfigurationJob(plugin, getSavedProjects()).schedule();
+    IProject[] projects = getSavedProjects();
+    if(projects != null && projects.length > 0) {
+      updateConfiguration(projects);
+    }
     disableStartup();
   }
 
@@ -87,6 +89,11 @@ public class UpdateConfigurationStartup implements IStartup {
     new UpdateConfigurationJob(MavenPlugin.getDefault(), projects.toArray(new IProject[projects.size()])).schedule();
   }
 
+  private static void updateConfiguration(IProject[] projects) {
+    final MavenPlugin plugin = MavenPlugin.getDefault();
+    new UpdateConfigurationJob(plugin, projects).schedule();
+  }
+
   private static void addEarlyStartup() {
     String[] disabledEarlyActivation = Workbench.getInstance().getDisabledEarlyActivatedPlugins();