jurt/com/sun/star/lib/util/AsynchronousFinalizer.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
New commits: commit 188fe404ba3157f739ee3e3dd65b42f8013ce39e Author: Samuel Mehrbrodt <[email protected]> AuthorDate: Fri Feb 15 11:31:04 2019 +0100 Commit: Stephan Bergmann <[email protected]> CommitDate: Mon Mar 4 10:43:53 2019 +0100 tdf#123481 jurt: Avoid thread deadlocking Change-Id: I7b6454090aeb1046a814520166a5b8c39b716f6d Reviewed-on: https://gerrit.libreoffice.org/67861 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> Reviewed-by: Samuel Mehrbrodt <[email protected]> (cherry picked from commit ea3c25358e3136cf900bc4e7d1bd6387dcca7883) Reviewed-on: https://gerrit.libreoffice.org/68660 Reviewed-by: Stephan Bergmann <[email protected]> diff --git a/jurt/com/sun/star/lib/util/AsynchronousFinalizer.java b/jurt/com/sun/star/lib/util/AsynchronousFinalizer.java index 0e7ecc41ba4d..588b8fe388f6 100644 --- a/jurt/com/sun/star/lib/util/AsynchronousFinalizer.java +++ b/jurt/com/sun/star/lib/util/AsynchronousFinalizer.java @@ -92,7 +92,9 @@ public final class AsynchronousFinalizer { done = true; queue.notify(); } - thread.join(); + // tdf#123481 Only join if we are not in our own thread, else we have a deadlock + if (Thread.currentThread() != thread) + thread.join(); } /** _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
