Kaydet (Commit) 1963dc64 authored tarafından Damjan Jovanovic's avatar Damjan Jovanovic Kaydeden (comit) Stephan Bergmann

Fix a locking bug in our Java ComponentBase class, where after the transition

to disposed, the relevant variables (bDisposed and bInDispose) are written to
outside a synchronized block.

The equivalent C++ implementation in main/cppuhelper/source/implbase.cxx,
method WeakComponentImplHelperBase::dispose(), already does this.

Patch by: me

(cherry picked from commit 2d382cef)

Change-Id: I6c3e2ef78bc3c945245fe9fb7b6b713eb83710be
Reviewed-on: https://gerrit.libreoffice.org/42189Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarStephan Bergmann <sbergman@redhat.com>
üst 5c0bb108
......@@ -87,8 +87,11 @@ public class ComponentBase extends WeakBase implements XComponent
// finally makes sure that the flags are set even if a RuntimeException is thrown.
// That ensures that this function is only called once.
bDisposed= true;
bInDispose= false;
synchronized (this)
bDisposed= true;
bInDispose= false;
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