diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2018-07-12 11:57:07 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2019-03-12 22:24:47 +0100 |
| commit | 1d9bcf421486f36e620a0743a81ea243b8ea3abc (patch) | |
| tree | 1116c95f845eafa6762c3dea42df588a89d9245f | |
| parent | e2fabc812615d9b504d3263818a251c597a81206 (diff) | |
call System.runFinalizersOnExit by reflection, since it was removed in jdk11
Change-Id: I542c87bc1de21727a035cc6ac3b3e20c0ccfb5f7
(cherry picked from commit 983035cc974faf9a2dcc1ecdf01391e618970a7f)
| -rw-r--r-- | external/hsqldb/UnpackedTarball_hsqldb.mk | 1 | ||||
| -rw-r--r-- | external/hsqldb/patches/hsqldb-runFinalizersOnExit.patch | 14 |
2 files changed, 15 insertions, 0 deletions
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 + } + |