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

Close all trackers and clear the map on PlexusFramework close #3782

Merged
merged 1 commit into from
Apr 27, 2024
Merged

Close all trackers and clear the map on PlexusFramework close #3782

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
10 changes: 6 additions & 4 deletions ...sisu-osgi-connect/src/main/java/org/eclipse/sisu/osgi/connect/PlexusConnectFramework.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ class PlexusConnectFramework //
private final ClassRealm realm;
final PlexusFrameworkConnectServiceFactory factory;
final boolean foreign;
private ServiceTracker<LogReaderService, LogReaderService> serviceTracker;
private ServiceTracker<LogReaderService, LogReaderService> logReaderServiceTracker;
private String storagePath;

PlexusConnectFramework(Framework framework, Logger logger, PlexusFrameworkConnectServiceFactory factory,
Expand Down Expand Up @@ -336,7 +336,7 @@ private static boolean isOnlyDebug(LogEntry entry) {
@Override
public void start(BundleContext context) {
context.addFrameworkListener(this);
serviceTracker = new ServiceTracker<>(context, LogReaderService.class, new ServiceTrackerCustomizer<>() {
logReaderServiceTracker = new ServiceTracker<>(context, LogReaderService.class, new ServiceTrackerCustomizer<>() {

@Override
public LogReaderService addingService(ServiceReference<LogReaderService> reference) {
Expand All @@ -357,12 +357,14 @@ public void removedService(ServiceReference<LogReaderService> reference, LogRead
context.ungetService(reference);
}
});
serviceTracker.open();
logReaderServiceTracker.open();
}

@Override
public void stop(BundleContext context) {
context.removeFrameworkListener(this);
serviceTracker.close();
logReaderServiceTracker.close();
trackerMap.values().forEach(ServiceTracker::close);
trackerMap.clear();
}
}
Loading