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

Merge remote-tracking branch 'github/bug6244' into main

Browse Source
This commit is contained in:
Axel Uhl committed 2026-04-29 22:32:55 +02:00
2 parents 2c321d3605 dfcf7dc8c9
commit 8c3df698c6
2 files changed
+7 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sse.security/src/com/sap/sse/security/SecurityInitializationCustomizer.java
+1 -1
View File
@@ -1,6 +1,6 @@
package com.sap.sse.security;
@FunctionalInterface
public interface SecurityInitializationCustomizer {
void customizeSecurityService(SecurityService securityService);
}
java/com.sap.sse.security/src/com/sap/sse/security/impl/Activator.java
+6 -4
View File
@@ -19,7 +19,6 @@ import com.sap.sse.ServerInfo;
import com.sap.sse.classloading.ServiceTrackerCustomizerForClassLoaderSupplierRegistrations;
import com.sap.sse.mail.MailService;
import com.sap.sse.replication.Replicable;
import com.sap.sse.replication.ReplicationMasterDescriptor;
import com.sap.sse.replication.ReplicationService;
import com.sap.sse.rest.CORSFilterConfiguration;
import com.sap.sse.security.SecurityInitializationCustomizer;
@@ -289,9 +288,12 @@ public class Activator implements BundleActivator {
// create security service, it will also create a default admin user if no users exist
createAndRegisterSecurityService(bundleContext, userStore, accessControlStore, subscriptionPlanProvider);
applyCustomizations();
migrate(userStore, securityService.get());
final ReplicationMasterDescriptor masterDescriptor = securityService.get().getMasterDescriptor();
if (masterDescriptor == null) {
final ReplicationService replicationService = ServiceTrackerFactory.createAndOpen(context, ReplicationService.class).waitForService(0);
// See also bug 6244: if the SecurityService will become a replica, don't worry about subscriptions
// and migrations as that is relevant only on the primary, and we don't want to establish or even replicate
// effects of temporary locally-created SERVER objects, ownerships, and permissions.
if (!replicationService.isReplicationStarting() && securityService.get().getMasterDescriptor() == null) {
migrate(userStore, securityService.get());
startSubscriptionDataUpdateTask(bundleContext);
startSubscriptionPlanUpdateTask(bundleContext);
}