Skip to content

Drop unregistered terminal service in TerminalServiceManager #491

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
Lars Vogel (vogella) wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Drop unregistered terminal service in TerminalServiceManager #491

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cabbafb
Drop unregistered terminal service in TerminalServiceManager
vogella Oct 15, 2026
99e791c
Merge branch 'main' into terminal-service-removed
jdneo Oct 21, 2026
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
24 changes: 10 additions & 14 deletions ...e.terminal.api/src/com/microsoft/copilot/eclipse/terminal/api/TerminalServiceManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,9 @@ private static TerminalServiceManager createInstance() {
}

private final BundleContext bundleContext;
private ServiceTracker<IRunInTerminalTool, IRunInTerminalTool> serviceTracker;
private volatile ServiceTracker<IRunInTerminalTool, IRunInTerminalTool> serviceTracker;
private final AtomicBoolean installationAttempted = new AtomicBoolean(false);
private final CopyOnWriteArrayList<TerminalServiceListener> listeners = new CopyOnWriteArrayList<>();
private volatile IRunInTerminalTool currentService = null;
private volatile List<String> cachedMissingDependencies = null;
private final boolean isModernTerminal;

Expand Down Expand Up @@ -121,8 +120,9 @@ public void addListener(TerminalServiceListener listener) {
listeners.add(listener);

// If service is already available, notify immediately
if (currentService != null) {
listener.onServiceAvailable(currentService);
IRunInTerminalTool service = getCurrentService();
if (service != null) {
listener.onServiceAvailable(service);
}

// Notify with cached missing dependencies if available
Expand All @@ -144,7 +144,8 @@ public void removeListener(TerminalServiceListener listener) {
* Get the current terminal service if available.
*/
public IRunInTerminalTool getCurrentService() {
return currentService;
ServiceTracker<IRunInTerminalTool, IRunInTerminalTool> tracker = serviceTracker;
return tracker != null ? tracker.getService() : null;
}

/**
Expand All @@ -156,7 +157,6 @@ private void start() {
public IRunInTerminalTool addingService(ServiceReference<IRunInTerminalTool> reference) {
IRunInTerminalTool service = bundleContext.getService(reference);
if (service != null) {
currentService = service;
notifyServiceAvailable(service);
}
return service;
Expand All @@ -165,23 +165,19 @@ public IRunInTerminalTool addingService(ServiceReference<IRunInTerminalTool> ref
@Override
public void modifiedService(ServiceReference<IRunInTerminalTool> reference, IRunInTerminalTool service) {
if (service != null) {
currentService = service;
notifyServiceAvailable(service);
}
}

@Override
public void removedService(ServiceReference<IRunInTerminalTool> reference, IRunInTerminalTool service) {
bundleContext.ungetService(reference);
}
};

serviceTracker = new ServiceTracker<>(bundleContext, IRunInTerminalTool.class, customizer);
serviceTracker.open();

IRunInTerminalTool[] services = serviceTracker.getServices(new IRunInTerminalTool[0]);
if (services != null && services.length > 0) {
currentService = services[0];
}
// Check if bundle needs to be installed or updated
attemptTerminalBundleInstallation();
}
Expand All @@ -190,11 +186,11 @@ public void removedService(ServiceReference<IRunInTerminalTool> reference, IRunI
* Stop the service manager.
*/
public void stop() {
if (serviceTracker != null) {
serviceTracker.close();
ServiceTracker<IRunInTerminalTool, IRunInTerminalTool> tracker = serviceTracker;
if (tracker != null) {
serviceTracker = null;
tracker.close();
}
currentService = null;
listeners.clear();
}

Expand Down
Loading