MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[stats-collector] EA-138414 - ISE: JsonReader.beginObject Just ignore a case when json could not be parsed

Browse Source
This commit is contained in:
Vitaliy.Bibaev
2019-03-21 19:52:51 +03:00
parent 6d6656b9ce
commit 43a025f62a
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/stats-collector/src/com/intellij/stats/experiment/WebServiceStatusProvider.kt
+6 -3
View File
@@ -6,6 +6,7 @@ import com.google.gson.Gson
import com.google.gson.JsonSyntaxException
import com.google.gson.internal.LinkedTreeMap
import com.intellij.ide.util.PropertiesComponent
import com.intellij.openapi.diagnostic.logger
import com.intellij.stats.network.assertNotEDT
import com.intellij.stats.network.service.RequestService
import java.util.concurrent.TimeUnit
@@ -17,6 +18,7 @@ class WebServiceStatusProvider(private val requestSender: RequestService) : WebS
const val STATUS_URL: String = "https://www.jetbrains.com/config/features-service-status.json"
private val GSON = Gson()
private val LOG = logger<WebServiceStatusProvider>()
private const val SALT = "completion.stats.experiment.salt"
private const val EXPERIMENT_VERSION_KEY = "completion.stats.experiment.version"
@@ -51,7 +53,7 @@ class WebServiceStatusProvider(private val requestSender: RequestService) : WebS
assertNotEDT()
val response = requestSender.get(STATUS_URL)
if (response != null && response.isOK()) {
val map = parseServerResponse(response.text)
val map = parseServerResponse(response.text) ?: return
val salt = map["salt"]?.toString()
val experimentVersion = map["experimentVersion"]?.toString()
@@ -76,12 +78,13 @@ class WebServiceStatusProvider(private val requestSender: RequestService) : WebS
}
}
private fun parseServerResponse(responseText: String): LinkedTreeMap<*, *> {
private fun parseServerResponse(responseText: String): LinkedTreeMap<*, *>? {
try {
return GSON.fromJson(responseText, LinkedTreeMap::class.java)
}
catch (e: JsonSyntaxException) {
throw JsonSyntaxException("Expected valid JSON object, but received: $responseText", e)
LOG.warn("Could not parse server response")
return null
}
}