Launch DiscoveryManager after populating indexes

cmaglie · cmaglie · commit 7d27c43ff237 · 2016-08-31T19:11:24.000+02:00
diff --git a/arduino-core/src/processing/app/BaseNoGui.java b/arduino-core/src/processing/app/BaseNoGui.java
@@ -605,9 +605,6 @@ static public void initLogger() {
   }
 
   static public void initPackages() throws Exception {
-
-    discoveryManager = new DiscoveryManager();
-
     indexer = new ContributionsIndexer(getSettingsFolder(), getHardwareFolder(), getPlatform(),
         new GPGDetachedSignatureVerifier());
 
@@ -635,6 +632,8 @@ static public void initPackages() throws Exception {
       File librariesIndexFile = librariesIndexer.getIndexFile();
       FileUtils.deleteIfExists(librariesIndexFile);
     }
+
+    discoveryManager = new DiscoveryManager();
   }
 
   static protected void initPlatform() {

Original file line number	Diff line number	Diff line change
`@@ -605,9 +605,6 @@ static public void initLogger() {`
`605`	`605`	`}`
`606`	`606`
`607`	`607`	`static public void initPackages() throws Exception {`
`608`		`-`
`609`		`- discoveryManager = new DiscoveryManager();`
`610`		`-`
`611`	`608`	`indexer = new ContributionsIndexer(getSettingsFolder(), getHardwareFolder(), getPlatform(),`
`612`	`609`	`new GPGDetachedSignatureVerifier());`
`613`	`610`
`@@ -635,6 +632,8 @@ static public void initPackages() throws Exception {`
`635`	`632`	`File librariesIndexFile = librariesIndexer.getIndexFile();`
`636`	`633`	`FileUtils.deleteIfExists(librariesIndexFile);`
`637`	`634`	`}`
	`635`	`+`
	`636`	`+ discoveryManager = new DiscoveryManager();`
`638`	`637`	`}`
`639`	`638`
`640`	`639`	`static protected void initPlatform() {`