Skip to content

Defer accessing instance preferences until service is registered #686

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+33 −4
Open

Defer accessing instance preferences until service is registered #686

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
37 changes: 33 additions & 4 deletions org.eclipse.jdt.launching/launching/org/eclipse/jdt/internal/launching/LaunchingPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,14 +83,17 @@
import org.eclipse.jdt.launching.JavaRuntime;
import org.eclipse.jdt.launching.VMStandin;
import org.eclipse.jdt.launching.sourcelookup.ArchiveSourceLocation;
import org.eclipse.osgi.service.datalocation.Location;
import org.eclipse.osgi.service.debug.DebugOptions;
import org.eclipse.osgi.service.debug.DebugOptionsListener;
import org.eclipse.osgi.service.debug.DebugTrace;
import org.eclipse.osgi.util.NLS;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Filter;
import org.osgi.framework.ServiceReference;
import org.osgi.service.prefs.BackingStoreException;
import org.osgi.util.tracker.ServiceTracker;
import org.osgi.util.tracker.ServiceTrackerCustomizer;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
Expand Down Expand Up @@ -201,6 +204,11 @@ public class LaunchingPlugin extends Plugin implements DebugOptionsListener, IEc
*/
private ServiceTracker<IWorkspace, IWorkspace> fWorkspaceServiceTracker;

/**
* Service tracker for the instance location service
*/
private ServiceTracker<Location, Location> fInstanceLocationServiceTracker;

/**
* Stores VM changes resulting from a JRE preference change.
*/
Expand Down Expand Up @@ -535,13 +543,12 @@ public void stop(BundleContext context) throws Exception {

DebugPlugin.getDefault().getLaunchManager().removeLaunchListener(this);
DebugPlugin.getDefault().removeDebugEventListener(this);
ResourcesPlugin.getWorkspace().removeResourceChangeListener(this);
ArchiveSourceLocation.closeArchives();
InstanceScope.INSTANCE.getNode(ID_PLUGIN).removePreferenceChangeListener(this);
JavaRuntime.removeVMInstallChangedListener(this);
JavaRuntime.saveVMConfiguration();
fgXMLParser = null;
fWorkspaceServiceTracker.close();
fInstanceLocationServiceTracker.close();
} finally {
super.stop(context);
}
Expand Down Expand Up @@ -584,6 +591,7 @@ public void saving(ISaveContext context1) throws CoreException {
writeInstallInfo();
}
});
workspace.addResourceChangeListener(LaunchingPlugin.this, IResourceChangeEvent.PRE_DELETE | IResourceChangeEvent.PRE_CLOSE);
} catch (CoreException e) {
log(e.getStatus());
context.ungetService(reference);
Expand All @@ -595,15 +603,36 @@ public void saving(ISaveContext context1) throws CoreException {
@Override
public void removedService(ServiceReference<IWorkspace> reference, IWorkspace service) {
service.removeSaveParticipant(ID_PLUGIN);
service.removeResourceChangeListener(LaunchingPlugin.this);
context.ungetService(reference);
}

};
fWorkspaceServiceTracker.open();

InstanceScope.INSTANCE.getNode(ID_PLUGIN).addPreferenceChangeListener(this);
// wait until the workspace has been selected and initialized
Filter instanceLocationFilter = context.createFilter("(&" + Location.INSTANCE_FILTER + "(url=*))"); //$NON-NLS-1$ //$NON-NLS-2$
fInstanceLocationServiceTracker = new ServiceTracker<>(context, instanceLocationFilter, new ServiceTrackerCustomizer<Location, Location>() {
@Override
public void removedService(ServiceReference<Location> reference, Location service) {
InstanceScope.INSTANCE.getNode(ID_PLUGIN).removePreferenceChangeListener(LaunchingPlugin.this);
}

@Override
public Location addingService(ServiceReference<Location> reference) {
InstanceScope.INSTANCE.getNode(ID_PLUGIN).addPreferenceChangeListener(LaunchingPlugin.this);
// no need to track the service
return null;
}

@Override
public void modifiedService(ServiceReference<Location> reference, Location service) {
}

});
fInstanceLocationServiceTracker.open();

JavaRuntime.addVMInstallChangedListener(this);
ResourcesPlugin.getWorkspace().addResourceChangeListener(this, IResourceChangeEvent.PRE_DELETE | IResourceChangeEvent.PRE_CLOSE);
DebugPlugin.getDefault().getLaunchManager().addLaunchListener(this);
DebugPlugin.getDefault().addDebugEventListener(this);
AdvancedSourceLookupSupport.start();
Expand Down
Loading