Fix leaks of started and unstarted services #937

basilevs · basilevs · commit 249d8c2d0f0c · 2025-09-01T00:27:29.000+04:00
diff --git a/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/ProvisioningAgent.java b/bundles/org.eclipse.equinox.p2.core/src/org/eclipse/equinox/internal/p2/core/ProvisioningAgent.java
@@ -80,10 +80,12 @@ private void checkRunning() {
 	@Override
 	public void registerService(String serviceName, Object service) {
 		checkRunning();
-		agentServices.put(serviceName, service);
 		if (service instanceof IAgentService) {
 			((IAgentService) service).start();
 		}
+		if (agentServices.put(serviceName, service) instanceof IAgentService previous) {
+			previous.stop();
+		}
 	}
 
 	public void setBundleContext(BundleContext context) {

Original file line number	Diff line number	Diff line change
`@@ -80,10 +80,12 @@ private void checkRunning() {`
`80`	`80`	`@Override`
`81`	`81`	`public void registerService(String serviceName, Object service) {`
`82`	`82`	`checkRunning();`
`83`		`- agentServices.put(serviceName, service);`
`84`	`83`	`if (service instanceof IAgentService) {`
`85`	`84`	`((IAgentService) service).start();`
`86`	`85`	`}`
	`86`	`+ if (agentServices.put(serviceName, service) instanceof IAgentService previous) {`
	`87`	`+ previous.stop();`
	`88`	`+ }`
`87`	`89`	`}`
`88`	`90`
`89`	`91`	`public void setBundleContext(BundleContext context) {`