8301712: [linux] Crash on exit from WebKit 615.1

Backport-of: 13d8df3
openjdk · Feb 11, 2023 · c05063c · c05063c · openjdk-notifier · Feb 11, 2023
1 parent b30861f
commit c05063c
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/modules/javafx.web/src/main/native/Source/WebCore/platform/ThreadTimers.cpp b/modules/javafx.web/src/main/native/Source/WebCore/platform/ThreadTimers.cpp
@@ -26,7 +26,9 @@
 
 #include "config.h"
 #include "ThreadTimers.h"
-
+#if PLATFORM(JAVA)
+#include <wtf/java/JavaEnv.h>
+#endif
 #include "MainThreadSharedTimer.h"
 #include "SharedTimer.h"
 #include "ThreadGlobalData.h"
@@ -63,7 +65,11 @@ void ThreadTimers::setSharedTimer(SharedTimer* sharedTimer)
 
     m_sharedTimer = sharedTimer;
 
+#if PLATFORM(JAVA)
+    if (sharedTimer && !g_ShuttingDown) {
+#else
     if (sharedTimer) {
+#endif
         m_sharedTimer->setFiredFunction([] { threadGlobalData().threadTimers().sharedTimerFiredInternal(); });
         updateSharedTimer();
     }