Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

#29999 Fix race condition when loading navigator nodes #33259

Merged
merged 4 commits into from
May 23, 2024
Merged

#29999 Fix race condition when loading navigator nodes #33259

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3718103
#29999 Fix race condition when loading navigator nodes
ShadelessFox May 20, 2024
b731faf
Merge branch 'devel' of https://github.com/dbeaver/dbeaver into dbeav…
ShadelessFox May 22, 2024
2419731
#29999 Use a different approach (remove extra node-loading call)
ShadelessFox May 22, 2024
55c79c8
Merge branch 'devel' into dbeaver/dbeaver#29999-project-loading-race-…
Matvey16 May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/navigator/DBNResource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public class DBNResource extends DBNNode implements DBNNodeWithResource, DBNStre

private IResource resource;
private DBPResourceHandler handler;
private DBNNode[] children;
private volatile DBNNode[] children;
private DBPImage resourceImage;

public DBNResource(DBNNode parentNode, IResource resource, DBPResourceHandler handler) {
Expand Down Expand Up @@ -216,7 +216,11 @@ public boolean allowsChildren() {
@Override
public DBNNode[] getChildren(DBRProgressMonitor monitor) throws DBException {
if (children == null) {
this.children = readChildNodes(monitor);
synchronized (this) {
ShadelessFox marked this conversation as resolved.
Show resolved Hide resolved
if (children == null) {
this.children = readChildNodes(monitor);
}
}
}
return children;
}
Expand Down