File 0001-call-System.runFinalizersOnExit-by-reflect... of Package libreoffice

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-call-System.runFinalizersOnExit-by-reflection-since-.patch of Package libreoffice (Revision 291a457ece49ee6e04bd2ac3d30ec842)

Currently displaying revision 291a457ece49ee6e04bd2ac3d30ec842 , Show latest

From 1d3f2ed0606cc971513dab5932ec7d1dd2a15f90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
Date: Thu, 12 Jul 2018 11:57:07 +0200
Subject: [PATCH] call System.runFinalizersOnExit by reflection, since it was
 removed in jdk11

Change-Id: I542c87bc1de21727a035cc6ac3b3e20c0ccfb5f7
---
 external/hsqldb/UnpackedTarball_hsqldb.mk          |  1 +
 .../patches/hsqldb-runFinalizersOnExit.patch       | 14 ++++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 external/hsqldb/patches/hsqldb-runFinalizersOnExit.patch

diff --git a/external/hsqldb/UnpackedTarball_hsqldb.mk b/external/hsqldb/UnpackedTarball_hsqldb.mk
index fc6c18f77c23..cbba770f19a0 100644
--- a/external/hsqldb/UnpackedTarball_hsqldb.mk
+++ b/external/hsqldb/UnpackedTarball_hsqldb.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,hsqldb,\
 	external/hsqldb/patches/i104901.patch \
 	external/hsqldb/patches/fdo36824.patch \
 	external/hsqldb/patches/limit_as_table_alias.patch \
+	external/hsqldb/patches/hsqldb-runFinalizersOnExit.patch \
 	$(if $(HSQLDB_USE_JDBC_4_1),\
 		external/hsqldb/patches/jdbc-4.1.patch \
 		external/hsqldb/patches/multipleResultSets.patch \
diff --git a/external/hsqldb/patches/hsqldb-runFinalizersOnExit.patch b/external/hsqldb/patches/hsqldb-runFinalizersOnExit.patch
new file mode 100644
index 000000000000..214dc2c2b2e1
--- /dev/null
+++ b/external/hsqldb/patches/hsqldb-runFinalizersOnExit.patch
@@ -0,0 +1,14 @@
+--- misc/hsqldb/src/org/hsqldb/lib/java/JavaSystem.java	2008-03-16 23:51:35.000000000 +0100
++++ misc/build/hsqldb/src/org/hsqldb/lib/java/JavaSystem.java	2018-07-12 11:46:57.997837180 +0200
+@@ -160,8 +160,9 @@
+     public static void runFinalizers() {
+ 
+ //#ifdef JAVA2FULL
+-        System.runFinalizersOnExit(true);
+-
++        try {
++            System.class.getMethod("runFinalizersOnExit", boolean.class).invoke(null, true);
++        } catch (Exception e) {}
+ //#endif
+     }
+ 
-- 
2.18.0

Places

File 0001-call-System.runFinalizersOnExit-by-reflection-since-.patch of Package libreoffice (Revision 291a457ece49ee6e04bd2ac3d30ec842)

Places