rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-01 12:24:14 +01:00
Code Issues Releases Activity

Merge branch 'contributed-index-parsing-exception' of git://github.com/sandeepmistry/Arduino

Browse Source
This commit is contained in:
Cristian Maglie 2016-03-17 12:55:36 +01:00
commit 65309f5c5a
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arduino-core/src/cc/arduino/contributions/packages/ContributionsIndexer.java
View File

@ -36,6 +36,8 @@ import cc.arduino.contributions.SignatureVerificationFailedException;
import cc.arduino.contributions.SignatureVerifier;
import cc.arduino.contributions.filters.BuiltInPredicate;
import cc.arduino.contributions.filters.InstalledPredicate;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.module.mrbean.MrBeanModule;
@ -87,8 +89,13 @@ public class ContributionsIndexer {
File[] indexFiles = preferencesFolder.listFiles(new TestPackageIndexFilenameFilter(new PackageIndexFilenameFilter(Constants.DEFAULT_INDEX_FILE_NAME)));
for (File indexFile : indexFiles) {
ContributionsIndex contributionsIndex = parseIndex(indexFile);
mergeContributions(contributionsIndex, indexFile);
try {
ContributionsIndex contributionsIndex = parseIndex(indexFile);
mergeContributions(contributionsIndex, indexFile);
} catch (JsonProcessingException e) {
System.err.println(I18n.format("Skipping contributed index file {0}, parsing error occured:", indexFile));
System.err.println(e);
}
}
List<ContributedPackage> packages = index.getPackages();