arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-16 11:21:18 +03:00
Code Activity

Deleting json files if they are some how corrupted. Fixes #3015

Browse Source
This commit is contained in:
Federico Fissore
2015-05-04 17:44:16 +02:00
parent 875a775e93
commit 0c123d7d14
2 changed files with 25 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
arduino-core/src/processing/app/BaseNoGui.java
View File

@ -7,6 +7,7 @@ import cc.arduino.contributions.packages.ContributionsIndexer;
import cc.arduino.files.DeleteFilesOnShutdown; import cc.arduino.files.DeleteFilesOnShutdown;
import cc.arduino.packages.DiscoveryManager; import cc.arduino.packages.DiscoveryManager;
import cc.arduino.packages.Uploader; import cc.arduino.packages.Uploader;
import com.fasterxml.jackson.core.JsonProcessingException;
import org.apache.commons.logging.impl.LogFactoryImpl; import org.apache.commons.logging.impl.LogFactoryImpl;
import org.apache.commons.logging.impl.NoOpLog; import org.apache.commons.logging.impl.NoOpLog;
import processing.app.debug.Compiler; import processing.app.debug.Compiler;
@ -597,9 +598,13 @@ public class BaseNoGui {
try { try {
indexer.parseIndex(); indexer.parseIndex();
} catch (JsonProcessingException e) {
FileUtils.deleteIfExists(indexFile);
FileUtils.deleteIfExists(indexSignatureFile);
throw e;
} catch (SignatureVerificationFailedException e) { } catch (SignatureVerificationFailedException e) {
indexFile.delete(); FileUtils.deleteIfExists(indexFile);
indexSignatureFile.delete(); FileUtils.deleteIfExists(indexSignatureFile);
throw e; throw e;
} }
indexer.syncWithFilesystem(getHardwareFolder()); indexer.syncWithFilesystem(getHardwareFolder());
@ -631,7 +636,12 @@ public class BaseNoGui {
} }
} }
} }
librariesIndexer.parseIndex(); try {
librariesIndexer.parseIndex();
} catch (JsonProcessingException e) {
FileUtils.deleteIfExists(librariesIndexFile);
throw e;
}
} }
static protected void initPlatform() { static protected void initPlatform() {

13
arduino-core/src/processing/app/helpers/FileUtils.java
View File

@ -85,7 +85,7 @@ public class FileUtils {
recursiveDelete(current); recursiveDelete(current);
} }
} }
file.delete(); deleteIfExists(file);
} }
public static File createTempFolder() throws IOException { public static File createTempFolder() throws IOException {
@ -269,5 +269,16 @@ public class FileUtils {
return result; return result;
} }
public static boolean deleteIfExists(File file) {
if (file == null) {
return true;
}
if (!file.exists()) {
return false;
}
return file.delete();
}
} }