external/hsqldb/UnpackedTarball_hsqldb.mk | 1 +
external/hsqldb/patches/hsqldb-runFinalizersOnExit.patch | 14 ++++++++++++++
2 files changed, 15 insertions(+)
New commits:
commit 983035cc974faf9a2dcc1ecdf01391e618970a7f
Author: Fridrich Štrba <fridrich.st...@bluewin.ch>
AuthorDate: Thu Jul 12 11:57:07 2018 +0200
Commit: Thorsten Behrens <thorsten.behr...@cib.de>
CommitDate: Tue Dec 11 12:37:05 2018 +0100
call System.runFinalizersOnExit by reflection, since it was removed in jdk11
Change-Id: I542c87bc1de21727a035cc6ac3b3e20c0ccfb5f7
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
+ }
+
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
