Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonah Graham2021-04-07 13:39:20 +0000
committerJonah Graham2021-04-08 14:56:14 +0000
commit2073d47084524f5d5f2c9a6cdb586f17c0348121 (patch)
treeb8f117229ccb77550265dd92378564d85778187f /core/org.eclipse.cdt.core
parent22ed0e0ae6eada04cf0ee1cc00cce41e523ae015 (diff)
downloadorg.eclipse.cdt-2073d47084524f5d5f2c9a6cdb586f17c0348121.tar.gz
org.eclipse.cdt-2073d47084524f5d5f2c9a6cdb586f17c0348121.tar.xz
org.eclipse.cdt-2073d47084524f5d5f2c9a6cdb586f17c0348121.zip
Bug 572648: Handle cases of empty (EOF) JSON files
Diffstat (limited to 'core/org.eclipse.cdt.core')
-rw-r--r--core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java
index 0c1b5b0f9d6..2e4f21c174a 100644
--- a/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java
+++ b/core/org.eclipse.cdt.core/src/org/eclipse/cdt/core/build/CBuildConfiguration.java
@@ -644,9 +644,10 @@ public abstract class CBuildConfiguration extends PlatformObject implements ICBu
scannerInfoCache = gson.fromJson(reader, ScannerInfoCache.class);
} catch (IOException e) {
CCorePlugin.log(e);
- scannerInfoCache = new ScannerInfoCache();
}
- } else {
+ }
+
+ if (scannerInfoCache == null) {
scannerInfoCache = new ScannerInfoCache();
}
scannerInfoCache.initCache();

Back to the top