eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-18 11:49:09 +00:00
Code Activity

bug5032: introduced map that ensures class loader isn't removed prematurely in case of multiple services per bundle

Browse Source
This commit is contained in:
Axel Uhl
2019-12-12 16:26:14 +01:00
parent 53a4c77dc6
commit 27ef7e3c15
2 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/DataMiningFrameworkActivator.java
+23 -8
View File
@@ -2,8 +2,11 @@ package com.sap.sse.datamining.impl;
import java.nio.charset.StandardCharsets;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.logging.Logger;
@@ -14,6 +17,7 @@ import org.osgi.framework.ServiceRegistration;
import org.osgi.util.tracker.ServiceTracker;
import org.osgi.util.tracker.ServiceTrackerCustomizer;
import com.sap.sse.common.Util;
import com.sap.sse.datamining.DataMiningBundleService;
import com.sap.sse.datamining.DataMiningPredefinedQueryService;
import com.sap.sse.datamining.DataMiningServer;
@@ -28,13 +32,13 @@ import com.sap.sse.datamining.components.management.FunctionRegistry;
import com.sap.sse.datamining.components.management.QueryDefinitionDTORegistry;
import com.sap.sse.datamining.impl.components.aggregators.ParallelGroupedDataCountAggregationProcessor;
import com.sap.sse.datamining.impl.components.aggregators.ParallelGroupedDataCountDistinctAggregationProcessor;
import com.sap.sse.datamining.impl.components.aggregators.ParallelGroupedNumberPairCollectingProcessor;
import com.sap.sse.datamining.impl.components.aggregators.ParallelGroupedNumberDataAverageAggregationProcessor;
import com.sap.sse.datamining.impl.components.aggregators.ParallelGroupedNumberDataMaxAggregationProcessor;
import com.sap.sse.datamining.impl.components.aggregators.ParallelGroupedNumberDataMedianAggregationProcessor;
import com.sap.sse.datamining.impl.components.aggregators.ParallelGroupedNumberDataMinAggregationProcessor;
import com.sap.sse.datamining.impl.components.aggregators.ParallelGroupedNumberDataSumAggregationProcessor;
import com.sap.sse.datamining.impl.components.aggregators.ParallelGroupedNumberPairAverageAggregationProcessor;
import com.sap.sse.datamining.impl.components.aggregators.ParallelGroupedNumberPairCollectingProcessor;
import com.sap.sse.datamining.impl.components.management.AggregationProcessorDefinitionManager;
import com.sap.sse.datamining.impl.components.management.DataRetrieverChainDefinitionManager;
import com.sap.sse.datamining.impl.components.management.DataSourceProviderManager;
@@ -55,12 +59,14 @@ public class DataMiningFrameworkActivator implements BundleActivator {
private ServiceTracker<DataMiningBundleService, DataMiningBundleService> dataMiningBundleServiceTracker;
private ServiceTracker<DataMiningPredefinedQueryService, DataMiningPredefinedQueryService> dataMiningPredefinedQueryServiceTracker;
private final Collection<ServiceRegistration<?>> serviceRegistrations;
private final Map<ClassLoader, Set<DataMiningBundleService>> dataMiningBundleServicesByTheirClassLoaders;
private final ModifiableDataMiningServer dataMiningServer;
public DataMiningFrameworkActivator() {
dataMiningServer = createDataMiningServer();
serviceRegistrations = new HashSet<>();
dataMiningBundleServicesByTheirClassLoaders = new HashMap<>();
}
private ModifiableDataMiningServer createDataMiningServer() {
@@ -100,7 +106,6 @@ public class DataMiningFrameworkActivator implements BundleActivator {
@Override
public void start(BundleContext context) throws Exception {
INSTANCE = this;
dataMiningBundleServiceTracker = new ServiceTracker<>(context, DataMiningBundleService.class, new ServiceTrackerCustomizer<DataMiningBundleService, DataMiningBundleService>() {
@Override
public DataMiningBundleService addingService(ServiceReference<DataMiningBundleService> reference) {
@@ -116,7 +121,6 @@ public class DataMiningFrameworkActivator implements BundleActivator {
}
});
dataMiningBundleServiceTracker.open();
dataMiningPredefinedQueryServiceTracker = new ServiceTracker<>(context, DataMiningPredefinedQueryService.class, new ServiceTrackerCustomizer<DataMiningPredefinedQueryService, DataMiningPredefinedQueryService>() {
@Override
public DataMiningPredefinedQueryService addingService(ServiceReference<DataMiningPredefinedQueryService> reference) {
@@ -136,13 +140,19 @@ public class DataMiningFrameworkActivator implements BundleActivator {
}
});
dataMiningPredefinedQueryServiceTracker.open();
serviceRegistrations.add(context.registerService(DataMiningServer.class, dataMiningServer, null));
}
private void registerDataMiningBundle(DataMiningBundleService dataMiningBundleService) {
logger.info("Registering data mining bundle " + dataMiningBundleService);
dataMiningServer.addDataMiningBundleClassLoader(dataMiningBundleService.getClassLoader());
synchronized (dataMiningBundleServicesByTheirClassLoaders) {
final ClassLoader classLoader = dataMiningBundleService.getClassLoader();
Util.addToValueSet(dataMiningBundleServicesByTheirClassLoaders, classLoader, dataMiningBundleService);
if (dataMiningBundleServicesByTheirClassLoaders.get(classLoader).size() == 1) {
// first service added for this class loader; add the class loader to the data mining server
dataMiningServer.addDataMiningBundleClassLoader(classLoader);
}
}
dataMiningServer.addStringMessages(dataMiningBundleService.getStringMessages());
dataMiningServer.registerAllClasses(dataMiningBundleService.getClassesWithMarkedMethods());
for (DataSourceProvider<?> dataSourceProvider : dataMiningBundleService.getDataSourceProviders()) {
@@ -158,7 +168,14 @@ public class DataMiningFrameworkActivator implements BundleActivator {
private void unregisterDataMiningBundle(DataMiningBundleService dataMiningBundleService) {
logger.info("Unregistering data mining bundle " + dataMiningBundleService);
dataMiningServer.removeDataMiningBundleClassLoader(dataMiningBundleService.getClassLoader());
synchronized (dataMiningBundleServicesByTheirClassLoaders) {
final ClassLoader classLoader = dataMiningBundleService.getClassLoader();
if (dataMiningBundleServicesByTheirClassLoaders.get(classLoader).size() == 1) {
// last service removed for this class loader; remove the class loader from the data mining server
dataMiningServer.removeDataMiningBundleClassLoader(dataMiningBundleService.getClassLoader());
}
Util.removeFromValueSet(dataMiningBundleServicesByTheirClassLoaders, classLoader, dataMiningBundleService);
}
dataMiningServer.removeStringMessages(dataMiningBundleService.getStringMessages());
dataMiningServer.unregisterAllFunctionsOf(dataMiningBundleService.getClassesWithMarkedMethods());
for (DataSourceProvider<?> dataSourceProvider : dataMiningBundleService.getDataSourceProviders()) {
@@ -176,7 +193,6 @@ public class DataMiningFrameworkActivator implements BundleActivator {
public void stop(BundleContext context) throws Exception {
dataMiningBundleServiceTracker.close();
dataMiningPredefinedQueryServiceTracker.close();
for (ServiceRegistration<?> serviceRegistration : serviceRegistrations) {
context.ungetService(serviceRegistration.getReference());
}
@@ -188,5 +204,4 @@ public class DataMiningFrameworkActivator implements BundleActivator {
}
return INSTANCE;
}
}
java/com.sap.sse.datamining/src/com/sap/sse/datamining/impl/DataMiningServerImpl.java
+2
View File
@@ -182,11 +182,13 @@ public class DataMiningServerImpl implements ModifiableDataMiningServer {
@Override
public void addDataMiningBundleClassLoader(ClassLoader classLoader) {
logger.info("Adding data mining bundle class loader "+classLoader);
dataMiningClassLoaders.add(classLoader);
}
@Override
public void removeDataMiningBundleClassLoader(ClassLoader classLoader) {
logger.info("Removing data mining bundle class loader "+classLoader);
dataMiningClassLoaders.remove(classLoader);
}