From 4e366912bc0bbf5a62c63d9fbe15f615d012ed93 Mon Sep 17 00:00:00 2001
From: Vadim Salavatov <vadim.salavatov@jetbrains.com>
Date: Tue, 19 Mar 2024 16:32:29 +0100
Subject: [PATCH] IDEA-349414 fix crash reporting condition
(cherry picked from commit 12df170b32d26c4028b25207e3f552568d851c01)
IJ-MR-129405
GitOrigin-RevId: 219a6bac4e0a0dc105ab5a622435be2e34a42a6d
---
.../intellij/diagnostic/PerformanceWatcherImpl.kt | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/platform/platform-impl/src/com/intellij/diagnostic/PerformanceWatcherImpl.kt b/platform/platform-impl/src/com/intellij/diagnostic/PerformanceWatcherImpl.kt
index 6846aa79011c..011cab7ece6f 100644
--- a/platform/platform-impl/src/com/intellij/diagnostic/PerformanceWatcherImpl.kt
+++ b/platform/platform-impl/src/com/intellij/diagnostic/PerformanceWatcherImpl.kt
@@ -556,16 +556,16 @@ private fun collectCrashInfo(pid: String, lastModified: Long): CrashInfo? {
LOG.info("Crash file $file is too big to report")
return@firstNotNullOfOrNull null
}
- val content = Files.readString(file.toPath())
- // TODO: maybe we need to notify the user
- // see https://youtrack.jetbrains.com/issue/IDEA-258128
- if (content.contains("fuck_the_regulations")) {
- return@firstNotNullOfOrNull null
- }
- return@firstNotNullOfOrNull content
+ return@firstNotNullOfOrNull Files.readString(file.toPath())
}
}.getOrLogException(LOG)
+ // TODO: maybe we need to notify the user
+ // see https://youtrack.jetbrains.com/issue/IDEA-258128
+ if (javaCrashContent != null && javaCrashContent.contains("fuck_the_regulations")) {
+ return null
+ }
+
val jbrErrContent = runCatching {
findExtraLogFile(pid, lastModified)?.let { Files.readString(it) }
}.getOrLogException(LOG)
--
GitLab