diff options
Diffstat (limited to 'jurt/com/sun/star/lib/util/AsynchronousFinalizer.java')
| -rw-r--r-- | jurt/com/sun/star/lib/util/AsynchronousFinalizer.java | 4 |
1 files changed, 3 insertions, 1 deletions
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(); } /** |