Kaydet (Commit) ea3c2535 authored tarafından Samuel Mehrbrodt's avatar Samuel Mehrbrodt

tdf#123481 jurt: Avoid thread deadlocking

Change-Id: I7b6454090aeb1046a814520166a5b8c39b716f6d
Reviewed-on: https://gerrit.libreoffice.org/67861
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
Reviewed-by: 's avatarSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
üst 44841a67
...@@ -92,7 +92,9 @@ public final class AsynchronousFinalizer { ...@@ -92,7 +92,9 @@ public final class AsynchronousFinalizer {
done = true; done = true;
queue.notify(); 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();
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment