Fix exception due to shutdown hook race condition

msimacek · msimacek · commit cb5d4fe5a56c · 2023-11-14T09:55:09.000+01:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CApiContext.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/capi/CApiContext.java
@@ -621,8 +621,12 @@ private void addNativeFinalizer(Env env, Object finalizeFunction, Object finaliz
     @TruffleBoundary
     public void finalizeCapi() {
         if (nativeFinalizerShutdownHook != null) {
-            Runtime.getRuntime().removeShutdownHook(nativeFinalizerShutdownHook);
-            nativeFinalizerRunnable.run();
+            try {
+                Runtime.getRuntime().removeShutdownHook(nativeFinalizerShutdownHook);
+                nativeFinalizerRunnable.run();
+            } catch (IllegalStateException e) {
+                // Shutdown already in progress, let it do the finalization then
+            }
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -621,8 +621,12 @@ private void addNativeFinalizer(Env env, Object finalizeFunction, Object finaliz`
`621`	`621`	`@TruffleBoundary`
`622`	`622`	`public void finalizeCapi() {`
`623`	`623`	`if (nativeFinalizerShutdownHook != null) {`
`624`		`- Runtime.getRuntime().removeShutdownHook(nativeFinalizerShutdownHook);`
`625`		`- nativeFinalizerRunnable.run();`
	`624`	`+ try {`
	`625`	`+ Runtime.getRuntime().removeShutdownHook(nativeFinalizerShutdownHook);`
	`626`	`+ nativeFinalizerRunnable.run();`
	`627`	`+ } catch (IllegalStateException e) {`
	`628`	`+ // Shutdown already in progress, let it do the finalization then`
	`629`	`+ }`
`626`	`630`	`}`
`627`	`631`	`}`
`628`	`632`