Skip to content

Remove preference listener if manager is shut down or project is deleted #1707

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

Merged
laeubi merged 1 commit into from
Mar 27, 2025
Merged

Remove preference listener if manager is shut down or project is deleted #1707

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/WorkspaceModelManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2003, 2022 IBM Corporation and others.
* Copyright (c) 2003, 2025 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
Expand Down Expand Up @@ -152,7 +152,11 @@ protected void addListeners() {

@Override
protected void removeListeners() {
PDECore.getWorkspace().removeResourceChangeListener(this);
IWorkspace workspace = PDECore.getWorkspace();
if (bundleRootChangedListener != null) {
Arrays.stream(workspace.getRoot().getProjects()).forEach(this::removeBundleRootChangedListener);
}
workspace.removeResourceChangeListener(this);
super.removeListeners();
}

Expand Down Expand Up @@ -198,6 +202,9 @@ public boolean visit(IResourceDelta delta) throws CoreException {
if (addedOrOpened && bundleRootChangedListener != null) {
addBundleRootChangedListener(project);
}
if (delta.getKind() == IResourceDelta.REMOVED && bundleRootChangedListener != null) {
removeBundleRootChangedListener(project);
}
if (isInterestingProject(project) && addedOrOpened) {
createModel(project, true);
return false;
Expand Down Expand Up @@ -227,6 +234,13 @@ private void addBundleRootChangedListener(IProject project) {
pdeNode.addPreferenceChangeListener(bundleRootChangedListener);
}

private void removeBundleRootChangedListener(IProject project) {
IEclipsePreferences pdeNode = new ProjectScope(project).getNode(PDECore.PLUGIN_ID);
// Remove the preference change listener when the project is removed
// from the workspace to make it eligible for garbage collection
pdeNode.removePreferenceChangeListener(bundleRootChangedListener);
}

protected IPreferenceChangeListener createBundleRootChangeListener() {
return e -> {
if (PDEProject.BUNDLE_ROOT_PATH.equals(e.getKey()) && !isInRemovedBranch(e.getNode())) {
Expand Down
Loading